Add support for game version 3.6 (#2110)

* Update to game version `3.6.0` (pt. 1) not complete! * Update to game version `3.6.0` (pt. 2) not complete! * Update compiled definitions
2026-05-29 04:29:50 +08:00 · 2023-04-30 19:08:54 -07:00
parent 60e8106b01
commit c4f1208f45
1323 changed files with 434863 additions and 141164 deletions
@@ -19,11 +19,11 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      com.google.protobuf.MessageOrBuilder {

    /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
     */
    int getExpeditionInfoMapCount();
    /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
     */
    boolean containsExpeditionInfoMap(
        long key);
@@ -34,57 +34,57 @@ public final class AvatarExpeditionAllDataRspOuterClass {
    java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
    getExpeditionInfoMap();
    /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
     */
    java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
    getExpeditionInfoMapMap();
    /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</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 = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
     */

    emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo getExpeditionInfoMapOrThrow(
        long key);

    /**
-     * <code>uint32 expedition_count_limit = 2;</code>
+     * <code>uint32 expedition_count_limit = 12;</code>
     * @return The expeditionCountLimit.
     */
    int getExpeditionCountLimit();

    /**
-     * <code>int32 retcode = 15;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>repeated uint32 open_expedition_list = 12;</code>
+     * <code>repeated uint32 open_expedition_list = 9;</code>
     * @return A list containing the openExpeditionList.
     */
    java.util.List<java.lang.Integer> getOpenExpeditionListList();
    /**
-     * <code>repeated uint32 open_expedition_list = 12;</code>
+     * <code>repeated uint32 open_expedition_list = 9;</code>
     * @return The count of openExpeditionList.
     */
    int getOpenExpeditionListCount();
    /**
-     * <code>repeated uint32 open_expedition_list = 12;</code>
+     * <code>repeated uint32 open_expedition_list = 9;</code>
     * @param index The index of the element to return.
     * @return The openExpeditionList at the given index.
     */
    int getOpenExpeditionList(int index);
+
+    /**
+     * <code>int32 retcode = 5;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
  }
  /**
   * <pre>
-   * Name: OJPKEJLHHMN
-   * CmdId: 1671
+   * CmdId: 1683
+   * Name: BFEGBKILMIB
   * </pre>
   *
   * Protobuf type {@code AvatarExpeditionAllDataRsp}
@@ -133,12 +133,33 @@ public final class AvatarExpeditionAllDataRspOuterClass {
            case 0:
              done = true;
              break;
-            case 16: {
+            case 40: {

-              expeditionCountLimit_ = input.readUInt32();
+              retcode_ = input.readInt32();
              break;
            }
-            case 58: {
+            case 72: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                openExpeditionList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              openExpeditionList_.addInt(input.readUInt32());
+              break;
+            }
+            case 74: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                openExpeditionList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                openExpeditionList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 90: {
              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                expeditionInfoMap_ = com.google.protobuf.MapField.newMapField(
                    ExpeditionInfoMapDefaultEntryHolder.defaultEntry);
@@ -152,29 +173,8 @@ public final class AvatarExpeditionAllDataRspOuterClass {
              break;
            }
            case 96: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                openExpeditionList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              openExpeditionList_.addInt(input.readUInt32());
-              break;
-            }
-            case 98: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                openExpeditionList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                openExpeditionList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 120: {

-              retcode_ = input.readInt32();
+              expeditionCountLimit_ = input.readUInt32();
              break;
            }
            default: {
@@ -209,7 +209,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
    protected com.google.protobuf.MapField internalGetMapField(
        int number) {
      switch (number) {
-        case 7:
+        case 11:
          return internalGetExpeditionInfoMap();
        default:
          throw new RuntimeException(
@@ -224,7 +224,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
              emu.grasscutter.net.proto.AvatarExpeditionAllDataRspOuterClass.AvatarExpeditionAllDataRsp.class, emu.grasscutter.net.proto.AvatarExpeditionAllDataRspOuterClass.AvatarExpeditionAllDataRsp.Builder.class);
    }

-    public static final int EXPEDITION_INFO_MAP_FIELD_NUMBER = 7;
+    public static final int EXPEDITION_INFO_MAP_FIELD_NUMBER = 11;
    private static final class ExpeditionInfoMapDefaultEntryHolder {
      static final com.google.protobuf.MapEntry<
          java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo> defaultEntry =
@@ -251,7 +251,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      return internalGetExpeditionInfoMap().getMap().size();
    }
    /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
     */

    @java.lang.Override
@@ -269,7 +269,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      return getExpeditionInfoMapMap();
    }
    /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
     */
    @java.lang.Override

@@ -277,7 +277,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      return internalGetExpeditionInfoMap().getMap();
    }
    /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
     */
    @java.lang.Override

@@ -290,7 +290,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      return map.containsKey(key) ? map.get(key) : defaultValue;
    }
    /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
     */
    @java.lang.Override

@@ -305,10 +305,10 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      return map.get(key);
    }

-    public static final int EXPEDITION_COUNT_LIMIT_FIELD_NUMBER = 2;
+    public static final int EXPEDITION_COUNT_LIMIT_FIELD_NUMBER = 12;
    private int expeditionCountLimit_;
    /**
-     * <code>uint32 expedition_count_limit = 2;</code>
+     * <code>uint32 expedition_count_limit = 12;</code>
     * @return The expeditionCountLimit.
     */
    @java.lang.Override
@@ -316,21 +316,10 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      return expeditionCountLimit_;
    }

-    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 OPEN_EXPEDITION_LIST_FIELD_NUMBER = 12;
+    public static final int OPEN_EXPEDITION_LIST_FIELD_NUMBER = 9;
    private com.google.protobuf.Internal.IntList openExpeditionList_;
    /**
-     * <code>repeated uint32 open_expedition_list = 12;</code>
+     * <code>repeated uint32 open_expedition_list = 9;</code>
     * @return A list containing the openExpeditionList.
     */
    @java.lang.Override
@@ -339,14 +328,14 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      return openExpeditionList_;
    }
    /**
-     * <code>repeated uint32 open_expedition_list = 12;</code>
+     * <code>repeated uint32 open_expedition_list = 9;</code>
     * @return The count of openExpeditionList.
     */
    public int getOpenExpeditionListCount() {
      return openExpeditionList_.size();
    }
    /**
-     * <code>repeated uint32 open_expedition_list = 12;</code>
+     * <code>repeated uint32 open_expedition_list = 9;</code>
     * @param index The index of the element to return.
     * @return The openExpeditionList at the given index.
     */
@@ -355,6 +344,17 @@ public final class AvatarExpeditionAllDataRspOuterClass {
    }
    private int openExpeditionListMemoizedSerializedSize = -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_;
+    }
+
    private byte memoizedIsInitialized = -1;
    @java.lang.Override
    public final boolean isInitialized() {
@@ -370,24 +370,24 @@ public final class AvatarExpeditionAllDataRspOuterClass {
    public void writeTo(com.google.protobuf.CodedOutputStream output)
                        throws java.io.IOException {
      getSerializedSize();
-      if (expeditionCountLimit_ != 0) {
-        output.writeUInt32(2, expeditionCountLimit_);
+      if (retcode_ != 0) {
+        output.writeInt32(5, retcode_);
+      }
+      if (getOpenExpeditionListList().size() > 0) {
+        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(openExpeditionListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < openExpeditionList_.size(); i++) {
+        output.writeUInt32NoTag(openExpeditionList_.getInt(i));
      }
      com.google.protobuf.GeneratedMessageV3
        .serializeLongMapTo(
          output,
          internalGetExpeditionInfoMap(),
          ExpeditionInfoMapDefaultEntryHolder.defaultEntry,
-          7);
-      if (getOpenExpeditionListList().size() > 0) {
-        output.writeUInt32NoTag(98);
-        output.writeUInt32NoTag(openExpeditionListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < openExpeditionList_.size(); i++) {
-        output.writeUInt32NoTag(openExpeditionList_.getInt(i));
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(15, retcode_);
+          11);
+      if (expeditionCountLimit_ != 0) {
+        output.writeUInt32(12, expeditionCountLimit_);
      }
      unknownFields.writeTo(output);
    }
@@ -398,19 +398,9 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      if (size != -1) return size;

      size = 0;
-      if (expeditionCountLimit_ != 0) {
+      if (retcode_ != 0) {
        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, expeditionCountLimit_);
-      }
-      for (java.util.Map.Entry<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo> entry
-           : internalGetExpeditionInfoMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
-        expeditionInfoMap__ = ExpeditionInfoMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(7, expeditionInfoMap__);
+          .computeInt32Size(5, retcode_);
      }
      {
        int dataSize = 0;
@@ -426,9 +416,19 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        }
        openExpeditionListMemoizedSerializedSize = dataSize;
      }
-      if (retcode_ != 0) {
+      for (java.util.Map.Entry<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo> entry
+           : internalGetExpeditionInfoMap().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
+        expeditionInfoMap__ = ExpeditionInfoMapDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(15, retcode_);
+            .computeMessageSize(11, expeditionInfoMap__);
+      }
+      if (expeditionCountLimit_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, expeditionCountLimit_);
      }
      size += unknownFields.getSerializedSize();
      memoizedSize = size;
@@ -449,10 +449,10 @@ public final class AvatarExpeditionAllDataRspOuterClass {
          other.internalGetExpeditionInfoMap())) return false;
      if (getExpeditionCountLimit()
          != other.getExpeditionCountLimit()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
      if (!getOpenExpeditionListList()
          .equals(other.getOpenExpeditionListList())) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
      if (!unknownFields.equals(other.unknownFields)) return false;
      return true;
    }
@@ -470,12 +470,12 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      }
      hash = (37 * hash) + EXPEDITION_COUNT_LIMIT_FIELD_NUMBER;
      hash = (53 * hash) + getExpeditionCountLimit();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
      if (getOpenExpeditionListCount() > 0) {
        hash = (37 * hash) + OPEN_EXPEDITION_LIST_FIELD_NUMBER;
        hash = (53 * hash) + getOpenExpeditionListList().hashCode();
      }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
      hash = (29 * hash) + unknownFields.hashCode();
      memoizedHashCode = hash;
      return hash;
@@ -573,8 +573,8 @@ public final class AvatarExpeditionAllDataRspOuterClass {
    }
    /**
     * <pre>
-     * Name: OJPKEJLHHMN
-     * CmdId: 1671
+     * CmdId: 1683
+     * Name: BFEGBKILMIB
     * </pre>
     *
     * Protobuf type {@code AvatarExpeditionAllDataRsp}
@@ -592,7 +592,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      protected com.google.protobuf.MapField internalGetMapField(
          int number) {
        switch (number) {
-          case 7:
+          case 11:
            return internalGetExpeditionInfoMap();
          default:
            throw new RuntimeException(
@@ -603,7 +603,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      protected com.google.protobuf.MapField internalGetMutableMapField(
          int number) {
        switch (number) {
-          case 7:
+          case 11:
            return internalGetMutableExpeditionInfoMap();
          default:
            throw new RuntimeException(
@@ -639,10 +639,10 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        internalGetMutableExpeditionInfoMap().clear();
        expeditionCountLimit_ = 0;

-        retcode_ = 0;
-
        openExpeditionList_ = emptyIntList();
        bitField0_ = (bitField0_ & ~0x00000002);
+        retcode_ = 0;
+
        return this;
      }

@@ -673,12 +673,12 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        result.expeditionInfoMap_ = internalGetExpeditionInfoMap();
        result.expeditionInfoMap_.makeImmutable();
        result.expeditionCountLimit_ = expeditionCountLimit_;
-        result.retcode_ = retcode_;
        if (((bitField0_ & 0x00000002) != 0)) {
          openExpeditionList_.makeImmutable();
          bitField0_ = (bitField0_ & ~0x00000002);
        }
        result.openExpeditionList_ = openExpeditionList_;
+        result.retcode_ = retcode_;
        onBuilt();
        return result;
      }
@@ -732,9 +732,6 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        if (other.getExpeditionCountLimit() != 0) {
          setExpeditionCountLimit(other.getExpeditionCountLimit());
        }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
        if (!other.openExpeditionList_.isEmpty()) {
          if (openExpeditionList_.isEmpty()) {
            openExpeditionList_ = other.openExpeditionList_;
@@ -745,6 +742,9 @@ public final class AvatarExpeditionAllDataRspOuterClass {
          }
          onChanged();
        }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
        this.mergeUnknownFields(other.unknownFields);
        onChanged();
        return this;
@@ -802,7 +802,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return internalGetExpeditionInfoMap().getMap().size();
      }
      /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
       */

      @java.lang.Override
@@ -820,7 +820,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return getExpeditionInfoMapMap();
      }
      /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
       */
      @java.lang.Override

@@ -828,7 +828,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return internalGetExpeditionInfoMap().getMap();
      }
      /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
       */
      @java.lang.Override

@@ -841,7 +841,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return map.containsKey(key) ? map.get(key) : defaultValue;
      }
      /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
       */
      @java.lang.Override

@@ -862,7 +862,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return this;
      }
      /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
       */

      public Builder removeExpeditionInfoMap(
@@ -881,7 +881,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return internalGetMutableExpeditionInfoMap().getMutableMap();
      }
      /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
       */
      public Builder putExpeditionInfoMap(
          long key,
@@ -893,7 +893,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return this;
      }
      /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 11;</code>
       */

      public Builder putAllExpeditionInfoMap(
@@ -905,7 +905,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {

      private int expeditionCountLimit_ ;
      /**
-       * <code>uint32 expedition_count_limit = 2;</code>
+       * <code>uint32 expedition_count_limit = 12;</code>
       * @return The expeditionCountLimit.
       */
      @java.lang.Override
@@ -913,7 +913,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return expeditionCountLimit_;
      }
      /**
-       * <code>uint32 expedition_count_limit = 2;</code>
+       * <code>uint32 expedition_count_limit = 12;</code>
       * @param value The expeditionCountLimit to set.
       * @return This builder for chaining.
       */
@@ -924,7 +924,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return this;
      }
      /**
-       * <code>uint32 expedition_count_limit = 2;</code>
+       * <code>uint32 expedition_count_limit = 12;</code>
       * @return This builder for chaining.
       */
      public Builder clearExpeditionCountLimit() {
@@ -934,37 +934,6 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        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 com.google.protobuf.Internal.IntList openExpeditionList_ = emptyIntList();
      private void ensureOpenExpeditionListIsMutable() {
        if (!((bitField0_ & 0x00000002) != 0)) {
@@ -973,7 +942,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
         }
      }
      /**
-       * <code>repeated uint32 open_expedition_list = 12;</code>
+       * <code>repeated uint32 open_expedition_list = 9;</code>
       * @return A list containing the openExpeditionList.
       */
      public java.util.List<java.lang.Integer>
@@ -982,14 +951,14 @@ public final class AvatarExpeditionAllDataRspOuterClass {
                 java.util.Collections.unmodifiableList(openExpeditionList_) : openExpeditionList_;
      }
      /**
-       * <code>repeated uint32 open_expedition_list = 12;</code>
+       * <code>repeated uint32 open_expedition_list = 9;</code>
       * @return The count of openExpeditionList.
       */
      public int getOpenExpeditionListCount() {
        return openExpeditionList_.size();
      }
      /**
-       * <code>repeated uint32 open_expedition_list = 12;</code>
+       * <code>repeated uint32 open_expedition_list = 9;</code>
       * @param index The index of the element to return.
       * @return The openExpeditionList at the given index.
       */
@@ -997,7 +966,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return openExpeditionList_.getInt(index);
      }
      /**
-       * <code>repeated uint32 open_expedition_list = 12;</code>
+       * <code>repeated uint32 open_expedition_list = 9;</code>
       * @param index The index to set the value at.
       * @param value The openExpeditionList to set.
       * @return This builder for chaining.
@@ -1010,7 +979,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return this;
      }
      /**
-       * <code>repeated uint32 open_expedition_list = 12;</code>
+       * <code>repeated uint32 open_expedition_list = 9;</code>
       * @param value The openExpeditionList to add.
       * @return This builder for chaining.
       */
@@ -1021,7 +990,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return this;
      }
      /**
-       * <code>repeated uint32 open_expedition_list = 12;</code>
+       * <code>repeated uint32 open_expedition_list = 9;</code>
       * @param values The openExpeditionList to add.
       * @return This builder for chaining.
       */
@@ -1034,7 +1003,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return this;
      }
      /**
-       * <code>repeated uint32 open_expedition_list = 12;</code>
+       * <code>repeated uint32 open_expedition_list = 9;</code>
       * @return This builder for chaining.
       */
      public Builder clearOpenExpeditionList() {
@@ -1043,6 +1012,37 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        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;
+      }
      @java.lang.Override
      public final Builder setUnknownFields(
          final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1117,11 +1117,11 @@ public final class AvatarExpeditionAllDataRspOuterClass {
    java.lang.String[] descriptorData = {
      "\n AvatarExpeditionAllDataRsp.proto\032\032Avat" +
      "arExpeditionInfo.proto\"\215\002\n\032AvatarExpedit" +
-      "ionAllDataRsp\022O\n\023expedition_info_map\030\007 \003" +
+      "ionAllDataRsp\022O\n\023expedition_info_map\030\013 \003" +
      "(\01322.AvatarExpeditionAllDataRsp.Expediti" +
      "onInfoMapEntry\022\036\n\026expedition_count_limit" +
-      "\030\002 \001(\r\022\017\n\007retcode\030\017 \001(\005\022\034\n\024open_expediti" +
-      "on_list\030\014 \003(\r\032O\n\026ExpeditionInfoMapEntry\022" +
+      "\030\014 \001(\r\022\034\n\024open_expedition_list\030\t \003(\r\022\017\n\007" +
+      "retcode\030\005 \001(\005\032O\n\026ExpeditionInfoMapEntry\022" +
      "\013\n\003key\030\001 \001(\004\022$\n\005value\030\002 \001(\0132\025.AvatarExpe" +
      "ditionInfo:\0028\001B\033\n\031emu.grasscutter.net.pr" +
      "otob\006proto3"
@@ -1136,7 +1136,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
    internal_static_AvatarExpeditionAllDataRsp_fieldAccessorTable = new
      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
        internal_static_AvatarExpeditionAllDataRsp_descriptor,
-        new java.lang.String[] { "ExpeditionInfoMap", "ExpeditionCountLimit", "Retcode", "OpenExpeditionList", });
+        new java.lang.String[] { "ExpeditionInfoMap", "ExpeditionCountLimit", "OpenExpeditionList", "Retcode", });
    internal_static_AvatarExpeditionAllDataRsp_ExpeditionInfoMapEntry_descriptor =
      internal_static_AvatarExpeditionAllDataRsp_descriptor.getNestedTypes().get(0);
    internal_static_AvatarExpeditionAllDataRsp_ExpeditionInfoMapEntry_fieldAccessorTable = new