Update gc to 3.3 (#1981)

* replace the deprecated api * update proto * delete music game * fixed codes * fix costume switch * fix mail bug * Bump version number. * Re-add max boss chest number Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
2026-05-28 01:47:06 +08:00 · 2022-12-24 05:12:02 +08:00
parent 8b83dbf58c
commit 92fbaa8670
1142 changed files with 474411 additions and 169883 deletions
@@ -18,23 +18,6 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      // @@protoc_insertion_point(interface_extends:AvatarExpeditionAllDataRsp)
      com.google.protobuf.MessageOrBuilder {

-    /**
-     * <code>repeated uint32 open_expedition_list = 3;</code>
-     * @return A list containing the openExpeditionList.
-     */
-    java.util.List<java.lang.Integer> getOpenExpeditionListList();
-    /**
-     * <code>repeated uint32 open_expedition_list = 3;</code>
-     * @return The count of openExpeditionList.
-     */
-    int getOpenExpeditionListCount();
-    /**
-     * <code>repeated uint32 open_expedition_list = 3;</code>
-     * @param index The index of the element to return.
-     * @return The openExpeditionList at the given index.
-     */
-    int getOpenExpeditionList(int index);
-
    /**
     * <code>int32 retcode = 15;</code>
     * @return The retcode.
@@ -42,17 +25,28 @@ public final class AvatarExpeditionAllDataRspOuterClass {
    int getRetcode();

    /**
-     * <code>uint32 expedition_count_limit = 12;</code>
-     * @return The expeditionCountLimit.
+     * <code>repeated uint32 open_expedition_list = 4;</code>
+     * @return A list containing the openExpeditionList.
     */
-    int getExpeditionCountLimit();
+    java.util.List<java.lang.Integer> getOpenExpeditionListList();
+    /**
+     * <code>repeated uint32 open_expedition_list = 4;</code>
+     * @return The count of openExpeditionList.
+     */
+    int getOpenExpeditionListCount();
+    /**
+     * <code>repeated uint32 open_expedition_list = 4;</code>
+     * @param index The index of the element to return.
+     * @return The openExpeditionList at the given index.
+     */
+    int getOpenExpeditionList(int index);

    /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 1;</code>
     */
    int getExpeditionInfoMapCount();
    /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 1;</code>
     */
    boolean containsExpeditionInfoMap(
        long key);
@@ -63,30 +57,39 @@ 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 = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 1;</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 = 1;</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 = 1;</code>
     */

    emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo getExpeditionInfoMapOrThrow(
        long key);
+
+    /**
+     * <code>uint32 expedition_count_limit = 13;</code>
+     * @return The expeditionCountLimit.
+     */
+    int getExpeditionCountLimit();
  }
  /**
   * <pre>
-   * CmdId: 1648
-   * EnetChannelId: 0
-   * EnetIsReliable: false
-   * IsAllowClient: true
+   * enum CmdId {
+   *   option allow_alias = true;
+   *   NONE = 0;
+   *   CMD_ID = 1621;
+   *   ENET_CHANNEL_ID = 0;
+   *   ENET_IS_RELIABLE = 1;
+   * }
   * </pre>
   *
   * Protobuf type {@code AvatarExpeditionAllDataRsp}
@@ -135,28 +138,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
            case 0:
              done = true;
              break;
-            case 24: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                openExpeditionList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              openExpeditionList_.addInt(input.readUInt32());
-              break;
-            }
-            case 26: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                openExpeditionList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                openExpeditionList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 34: {
+            case 10: {
              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                expeditionInfoMap_ = com.google.protobuf.MapField.newMapField(
                    ExpeditionInfoMapDefaultEntryHolder.defaultEntry);
@@ -169,7 +151,28 @@ public final class AvatarExpeditionAllDataRspOuterClass {
                  expeditionInfoMap__.getKey(), expeditionInfoMap__.getValue());
              break;
            }
-            case 96: {
+            case 32: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                openExpeditionList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              openExpeditionList_.addInt(input.readUInt32());
+              break;
+            }
+            case 34: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                openExpeditionList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                openExpeditionList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 104: {

              expeditionCountLimit_ = input.readUInt32();
              break;
@@ -211,7 +214,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
    protected com.google.protobuf.MapField internalGetMapField(
        int number) {
      switch (number) {
-        case 4:
+        case 1:
          return internalGetExpeditionInfoMap();
        default:
          throw new RuntimeException(
@@ -226,34 +229,6 @@ public final class AvatarExpeditionAllDataRspOuterClass {
              emu.grasscutter.net.proto.AvatarExpeditionAllDataRspOuterClass.AvatarExpeditionAllDataRsp.class, emu.grasscutter.net.proto.AvatarExpeditionAllDataRspOuterClass.AvatarExpeditionAllDataRsp.Builder.class);
    }

-    public static final int OPEN_EXPEDITION_LIST_FIELD_NUMBER = 3;
-    private com.google.protobuf.Internal.IntList openExpeditionList_;
-    /**
-     * <code>repeated uint32 open_expedition_list = 3;</code>
-     * @return A list containing the openExpeditionList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getOpenExpeditionListList() {
-      return openExpeditionList_;
-    }
-    /**
-     * <code>repeated uint32 open_expedition_list = 3;</code>
-     * @return The count of openExpeditionList.
-     */
-    public int getOpenExpeditionListCount() {
-      return openExpeditionList_.size();
-    }
-    /**
-     * <code>repeated uint32 open_expedition_list = 3;</code>
-     * @param index The index of the element to return.
-     * @return The openExpeditionList at the given index.
-     */
-    public int getOpenExpeditionList(int index) {
-      return openExpeditionList_.getInt(index);
-    }
-    private int openExpeditionListMemoizedSerializedSize = -1;
-
    public static final int RETCODE_FIELD_NUMBER = 15;
    private int retcode_;
    /**
@@ -265,18 +240,35 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      return retcode_;
    }

-    public static final int EXPEDITION_COUNT_LIMIT_FIELD_NUMBER = 12;
-    private int expeditionCountLimit_;
+    public static final int OPEN_EXPEDITION_LIST_FIELD_NUMBER = 4;
+    private com.google.protobuf.Internal.IntList openExpeditionList_;
    /**
-     * <code>uint32 expedition_count_limit = 12;</code>
-     * @return The expeditionCountLimit.
+     * <code>repeated uint32 open_expedition_list = 4;</code>
+     * @return A list containing the openExpeditionList.
     */
    @java.lang.Override
-    public int getExpeditionCountLimit() {
-      return expeditionCountLimit_;
+    public java.util.List<java.lang.Integer>
+        getOpenExpeditionListList() {
+      return openExpeditionList_;
    }
+    /**
+     * <code>repeated uint32 open_expedition_list = 4;</code>
+     * @return The count of openExpeditionList.
+     */
+    public int getOpenExpeditionListCount() {
+      return openExpeditionList_.size();
+    }
+    /**
+     * <code>repeated uint32 open_expedition_list = 4;</code>
+     * @param index The index of the element to return.
+     * @return The openExpeditionList at the given index.
+     */
+    public int getOpenExpeditionList(int index) {
+      return openExpeditionList_.getInt(index);
+    }
+    private int openExpeditionListMemoizedSerializedSize = -1;

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

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

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

@@ -342,7 +334,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      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 = 1;</code>
     */
    @java.lang.Override

@@ -357,6 +349,17 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      return map.get(key);
    }

+    public static final int EXPEDITION_COUNT_LIMIT_FIELD_NUMBER = 13;
+    private int expeditionCountLimit_;
+    /**
+     * <code>uint32 expedition_count_limit = 13;</code>
+     * @return The expeditionCountLimit.
+     */
+    @java.lang.Override
+    public int getExpeditionCountLimit() {
+      return expeditionCountLimit_;
+    }
+
    private byte memoizedIsInitialized = -1;
    @java.lang.Override
    public final boolean isInitialized() {
@@ -372,21 +375,21 @@ public final class AvatarExpeditionAllDataRspOuterClass {
    public void writeTo(com.google.protobuf.CodedOutputStream output)
                        throws java.io.IOException {
      getSerializedSize();
-      if (getOpenExpeditionListList().size() > 0) {
-        output.writeUInt32NoTag(26);
-        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,
-          4);
+          1);
+      if (getOpenExpeditionListList().size() > 0) {
+        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(openExpeditionListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < openExpeditionList_.size(); i++) {
+        output.writeUInt32NoTag(openExpeditionList_.getInt(i));
+      }
      if (expeditionCountLimit_ != 0) {
-        output.writeUInt32(12, expeditionCountLimit_);
+        output.writeUInt32(13, expeditionCountLimit_);
      }
      if (retcode_ != 0) {
        output.writeInt32(15, retcode_);
@@ -400,6 +403,16 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      if (size != -1) return size;

      size = 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
+            .computeMessageSize(1, expeditionInfoMap__);
+      }
      {
        int dataSize = 0;
        for (int i = 0; i < openExpeditionList_.size(); i++) {
@@ -414,19 +427,9 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        }
        openExpeditionListMemoizedSerializedSize = dataSize;
      }
-      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(4, expeditionInfoMap__);
-      }
      if (expeditionCountLimit_ != 0) {
        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, expeditionCountLimit_);
+          .computeUInt32Size(13, expeditionCountLimit_);
      }
      if (retcode_ != 0) {
        size += com.google.protobuf.CodedOutputStream
@@ -447,14 +450,14 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      }
      emu.grasscutter.net.proto.AvatarExpeditionAllDataRspOuterClass.AvatarExpeditionAllDataRsp other = (emu.grasscutter.net.proto.AvatarExpeditionAllDataRspOuterClass.AvatarExpeditionAllDataRsp) obj;

-      if (!getOpenExpeditionListList()
-          .equals(other.getOpenExpeditionListList())) return false;
      if (getRetcode()
          != other.getRetcode()) return false;
-      if (getExpeditionCountLimit()
-          != other.getExpeditionCountLimit()) return false;
+      if (!getOpenExpeditionListList()
+          .equals(other.getOpenExpeditionListList())) return false;
      if (!internalGetExpeditionInfoMap().equals(
          other.internalGetExpeditionInfoMap())) return false;
+      if (getExpeditionCountLimit()
+          != other.getExpeditionCountLimit()) return false;
      if (!unknownFields.equals(other.unknownFields)) return false;
      return true;
    }
@@ -466,18 +469,18 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      }
      int hash = 41;
      hash = (19 * hash) + getDescriptor().hashCode();
+      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 = (37 * hash) + EXPEDITION_COUNT_LIMIT_FIELD_NUMBER;
-      hash = (53 * hash) + getExpeditionCountLimit();
      if (!internalGetExpeditionInfoMap().getMap().isEmpty()) {
        hash = (37 * hash) + EXPEDITION_INFO_MAP_FIELD_NUMBER;
        hash = (53 * hash) + internalGetExpeditionInfoMap().hashCode();
      }
+      hash = (37 * hash) + EXPEDITION_COUNT_LIMIT_FIELD_NUMBER;
+      hash = (53 * hash) + getExpeditionCountLimit();
      hash = (29 * hash) + unknownFields.hashCode();
      memoizedHashCode = hash;
      return hash;
@@ -575,10 +578,13 @@ public final class AvatarExpeditionAllDataRspOuterClass {
    }
    /**
     * <pre>
-     * CmdId: 1648
-     * EnetChannelId: 0
-     * EnetIsReliable: false
-     * IsAllowClient: true
+     * enum CmdId {
+     *   option allow_alias = true;
+     *   NONE = 0;
+     *   CMD_ID = 1621;
+     *   ENET_CHANNEL_ID = 0;
+     *   ENET_IS_RELIABLE = 1;
+     * }
     * </pre>
     *
     * Protobuf type {@code AvatarExpeditionAllDataRsp}
@@ -596,7 +602,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      protected com.google.protobuf.MapField internalGetMapField(
          int number) {
        switch (number) {
-          case 4:
+          case 1:
            return internalGetExpeditionInfoMap();
          default:
            throw new RuntimeException(
@@ -607,7 +613,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      protected com.google.protobuf.MapField internalGetMutableMapField(
          int number) {
        switch (number) {
-          case 4:
+          case 1:
            return internalGetMutableExpeditionInfoMap();
          default:
            throw new RuntimeException(
@@ -640,13 +646,13 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      @java.lang.Override
      public Builder clear() {
        super.clear();
-        openExpeditionList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
        retcode_ = 0;

+        openExpeditionList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        internalGetMutableExpeditionInfoMap().clear();
        expeditionCountLimit_ = 0;

-        internalGetMutableExpeditionInfoMap().clear();
        return this;
      }

@@ -674,15 +680,15 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      public emu.grasscutter.net.proto.AvatarExpeditionAllDataRspOuterClass.AvatarExpeditionAllDataRsp buildPartial() {
        emu.grasscutter.net.proto.AvatarExpeditionAllDataRspOuterClass.AvatarExpeditionAllDataRsp result = new emu.grasscutter.net.proto.AvatarExpeditionAllDataRspOuterClass.AvatarExpeditionAllDataRsp(this);
        int from_bitField0_ = bitField0_;
+        result.retcode_ = retcode_;
        if (((bitField0_ & 0x00000001) != 0)) {
          openExpeditionList_.makeImmutable();
          bitField0_ = (bitField0_ & ~0x00000001);
        }
        result.openExpeditionList_ = openExpeditionList_;
-        result.retcode_ = retcode_;
-        result.expeditionCountLimit_ = expeditionCountLimit_;
        result.expeditionInfoMap_ = internalGetExpeditionInfoMap();
        result.expeditionInfoMap_.makeImmutable();
+        result.expeditionCountLimit_ = expeditionCountLimit_;
        onBuilt();
        return result;
      }
@@ -731,6 +737,9 @@ public final class AvatarExpeditionAllDataRspOuterClass {

      public Builder mergeFrom(emu.grasscutter.net.proto.AvatarExpeditionAllDataRspOuterClass.AvatarExpeditionAllDataRsp other) {
        if (other == emu.grasscutter.net.proto.AvatarExpeditionAllDataRspOuterClass.AvatarExpeditionAllDataRsp.getDefaultInstance()) return this;
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
        if (!other.openExpeditionList_.isEmpty()) {
          if (openExpeditionList_.isEmpty()) {
            openExpeditionList_ = other.openExpeditionList_;
@@ -741,14 +750,11 @@ public final class AvatarExpeditionAllDataRspOuterClass {
          }
          onChanged();
        }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
+        internalGetMutableExpeditionInfoMap().mergeFrom(
+            other.internalGetExpeditionInfoMap());
        if (other.getExpeditionCountLimit() != 0) {
          setExpeditionCountLimit(other.getExpeditionCountLimit());
        }
-        internalGetMutableExpeditionInfoMap().mergeFrom(
-            other.internalGetExpeditionInfoMap());
        this.mergeUnknownFields(other.unknownFields);
        onChanged();
        return this;
@@ -779,85 +785,6 @@ public final class AvatarExpeditionAllDataRspOuterClass {
      }
      private int bitField0_;

-      private com.google.protobuf.Internal.IntList openExpeditionList_ = emptyIntList();
-      private void ensureOpenExpeditionListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          openExpeditionList_ = mutableCopy(openExpeditionList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 open_expedition_list = 3;</code>
-       * @return A list containing the openExpeditionList.
-       */
-      public java.util.List<java.lang.Integer>
-          getOpenExpeditionListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(openExpeditionList_) : openExpeditionList_;
-      }
-      /**
-       * <code>repeated uint32 open_expedition_list = 3;</code>
-       * @return The count of openExpeditionList.
-       */
-      public int getOpenExpeditionListCount() {
-        return openExpeditionList_.size();
-      }
-      /**
-       * <code>repeated uint32 open_expedition_list = 3;</code>
-       * @param index The index of the element to return.
-       * @return The openExpeditionList at the given index.
-       */
-      public int getOpenExpeditionList(int index) {
-        return openExpeditionList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 open_expedition_list = 3;</code>
-       * @param index The index to set the value at.
-       * @param value The openExpeditionList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOpenExpeditionList(
-          int index, int value) {
-        ensureOpenExpeditionListIsMutable();
-        openExpeditionList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 open_expedition_list = 3;</code>
-       * @param value The openExpeditionList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addOpenExpeditionList(int value) {
-        ensureOpenExpeditionListIsMutable();
-        openExpeditionList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 open_expedition_list = 3;</code>
-       * @param values The openExpeditionList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllOpenExpeditionList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureOpenExpeditionListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, openExpeditionList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 open_expedition_list = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOpenExpeditionList() {
-        openExpeditionList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
      private int retcode_ ;
      /**
       * <code>int32 retcode = 15;</code>
@@ -889,33 +816,81 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return this;
      }

-      private int expeditionCountLimit_ ;
-      /**
-       * <code>uint32 expedition_count_limit = 12;</code>
-       * @return The expeditionCountLimit.
-       */
-      @java.lang.Override
-      public int getExpeditionCountLimit() {
-        return expeditionCountLimit_;
+      private com.google.protobuf.Internal.IntList openExpeditionList_ = emptyIntList();
+      private void ensureOpenExpeditionListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          openExpeditionList_ = mutableCopy(openExpeditionList_);
+          bitField0_ |= 0x00000001;
+         }
      }
      /**
-       * <code>uint32 expedition_count_limit = 12;</code>
-       * @param value The expeditionCountLimit to set.
+       * <code>repeated uint32 open_expedition_list = 4;</code>
+       * @return A list containing the openExpeditionList.
+       */
+      public java.util.List<java.lang.Integer>
+          getOpenExpeditionListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(openExpeditionList_) : openExpeditionList_;
+      }
+      /**
+       * <code>repeated uint32 open_expedition_list = 4;</code>
+       * @return The count of openExpeditionList.
+       */
+      public int getOpenExpeditionListCount() {
+        return openExpeditionList_.size();
+      }
+      /**
+       * <code>repeated uint32 open_expedition_list = 4;</code>
+       * @param index The index of the element to return.
+       * @return The openExpeditionList at the given index.
+       */
+      public int getOpenExpeditionList(int index) {
+        return openExpeditionList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 open_expedition_list = 4;</code>
+       * @param index The index to set the value at.
+       * @param value The openExpeditionList to set.
       * @return This builder for chaining.
       */
-      public Builder setExpeditionCountLimit(int value) {
-        
-        expeditionCountLimit_ = value;
+      public Builder setOpenExpeditionList(
+          int index, int value) {
+        ensureOpenExpeditionListIsMutable();
+        openExpeditionList_.setInt(index, value);
        onChanged();
        return this;
      }
      /**
-       * <code>uint32 expedition_count_limit = 12;</code>
+       * <code>repeated uint32 open_expedition_list = 4;</code>
+       * @param value The openExpeditionList to add.
       * @return This builder for chaining.
       */
-      public Builder clearExpeditionCountLimit() {
-        
-        expeditionCountLimit_ = 0;
+      public Builder addOpenExpeditionList(int value) {
+        ensureOpenExpeditionListIsMutable();
+        openExpeditionList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 open_expedition_list = 4;</code>
+       * @param values The openExpeditionList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllOpenExpeditionList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureOpenExpeditionListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, openExpeditionList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 open_expedition_list = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOpenExpeditionList() {
+        openExpeditionList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
        onChanged();
        return this;
      }
@@ -947,7 +922,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        return internalGetExpeditionInfoMap().getMap().size();
      }
      /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 1;</code>
       */

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

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

@@ -986,7 +961,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
        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 = 1;</code>
       */
      @java.lang.Override

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

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

      public Builder putAllExpeditionInfoMap(
@@ -1047,6 +1022,37 @@ public final class AvatarExpeditionAllDataRspOuterClass {
            .putAll(values);
        return this;
      }
+
+      private int expeditionCountLimit_ ;
+      /**
+       * <code>uint32 expedition_count_limit = 13;</code>
+       * @return The expeditionCountLimit.
+       */
+      @java.lang.Override
+      public int getExpeditionCountLimit() {
+        return expeditionCountLimit_;
+      }
+      /**
+       * <code>uint32 expedition_count_limit = 13;</code>
+       * @param value The expeditionCountLimit to set.
+       * @return This builder for chaining.
+       */
+      public Builder setExpeditionCountLimit(int value) {
+        
+        expeditionCountLimit_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 expedition_count_limit = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearExpeditionCountLimit() {
+        
+        expeditionCountLimit_ = 0;
+        onChanged();
+        return this;
+      }
      @java.lang.Override
      public final Builder setUnknownFields(
          final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1121,11 +1127,11 @@ public final class AvatarExpeditionAllDataRspOuterClass {
    java.lang.String[] descriptorData = {
      "\n AvatarExpeditionAllDataRsp.proto\032\032Avat" +
      "arExpeditionInfo.proto\"\215\002\n\032AvatarExpedit" +
-      "ionAllDataRsp\022\034\n\024open_expedition_list\030\003 " +
-      "\003(\r\022\017\n\007retcode\030\017 \001(\005\022\036\n\026expedition_count" +
-      "_limit\030\014 \001(\r\022O\n\023expedition_info_map\030\004 \003(" +
-      "\01322.AvatarExpeditionAllDataRsp.Expeditio" +
-      "nInfoMapEntry\032O\n\026ExpeditionInfoMapEntry\022" +
+      "ionAllDataRsp\022\017\n\007retcode\030\017 \001(\005\022\034\n\024open_e" +
+      "xpedition_list\030\004 \003(\r\022O\n\023expedition_info_" +
+      "map\030\001 \003(\01322.AvatarExpeditionAllDataRsp.E" +
+      "xpeditionInfoMapEntry\022\036\n\026expedition_coun" +
+      "t_limit\030\r \001(\r\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"
@@ -1140,7 +1146,7 @@ public final class AvatarExpeditionAllDataRspOuterClass {
    internal_static_AvatarExpeditionAllDataRsp_fieldAccessorTable = new
      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
        internal_static_AvatarExpeditionAllDataRsp_descriptor,
-        new java.lang.String[] { "OpenExpeditionList", "Retcode", "ExpeditionCountLimit", "ExpeditionInfoMap", });
+        new java.lang.String[] { "Retcode", "OpenExpeditionList", "ExpeditionInfoMap", "ExpeditionCountLimit", });
    internal_static_AvatarExpeditionAllDataRsp_ExpeditionInfoMapEntry_descriptor =
      internal_static_AvatarExpeditionAllDataRsp_descriptor.getNestedTypes().get(0);
    internal_static_AvatarExpeditionAllDataRsp_ExpeditionInfoMapEntry_fieldAccessorTable = new