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-18 11:31:18 +08:00 · 2023-04-30 19:08:54 -07:00
parent 60e8106b01
commit c4f1208f45
1323 changed files with 434863 additions and 141164 deletions
@@ -19,28 +19,45 @@ public final class AvatarTeamAllDataNotifyOuterClass {
      com.google.protobuf.MessageOrBuilder {

    /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 8;</code>
+     * <code>repeated uint32 backup_avatar_team_order_list = 12;</code>
     * @return A list containing the backupAvatarTeamOrderList.
     */
    java.util.List<java.lang.Integer> getBackupAvatarTeamOrderListList();
    /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 8;</code>
+     * <code>repeated uint32 backup_avatar_team_order_list = 12;</code>
     * @return The count of backupAvatarTeamOrderList.
     */
    int getBackupAvatarTeamOrderListCount();
    /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 8;</code>
+     * <code>repeated uint32 backup_avatar_team_order_list = 12;</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 = 3;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 5;</code>
+     * @return A list containing the tempAvatarGuidList.
+     */
+    java.util.List<java.lang.Long> getTempAvatarGuidListList();
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 5;</code>
+     * @return The count of tempAvatarGuidList.
+     */
+    int getTempAvatarGuidListCount();
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 5;</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 = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
     */
    boolean containsAvatarTeamMap(
        int key);
@@ -51,45 +68,28 @@ 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 = 3;</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 = 3;</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 = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
     */

    emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrThrow(
        int key);
-
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 6;</code>
-     * @return A list containing the tempAvatarGuidList.
-     */
-    java.util.List<java.lang.Long> getTempAvatarGuidListList();
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 6;</code>
-     * @return The count of tempAvatarGuidList.
-     */
-    int getTempAvatarGuidListCount();
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 6;</code>
-     * @param index The index of the element to return.
-     * @return The tempAvatarGuidList at the given index.
-     */
-    long getTempAvatarGuidList(int index);
  }
  /**
   * <pre>
-   * Name: IKLIDEBOGPM
-   * CmdId: 1729
+   * CmdId: 1799
+   * Name: BBFCJICAALL
   * </pre>
   *
   * Protobuf type {@code AvatarTeamAllDataNotify}
@@ -139,11 +139,32 @@ public final class AvatarTeamAllDataNotifyOuterClass {
            case 0:
              done = true;
              break;
-            case 26: {
+            case 40: {
              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                tempAvatarGuidList_ = newLongList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              tempAvatarGuidList_.addLong(input.readUInt64());
+              break;
+            }
+            case 42: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                tempAvatarGuidList_ = newLongList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                tempAvatarGuidList_.addLong(input.readUInt64());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 58: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                avatarTeamMap_ = com.google.protobuf.MapField.newMapField(
                    AvatarTeamMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000004;
              }
              com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
              avatarTeamMap__ = input.readMessage(
@@ -152,28 +173,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
                  avatarTeamMap__.getKey(), avatarTeamMap__.getValue());
              break;
            }
-            case 48: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                tempAvatarGuidList_ = newLongList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              tempAvatarGuidList_.addLong(input.readUInt64());
-              break;
-            }
-            case 50: {
-              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);
-              break;
-            }
-            case 64: {
+            case 96: {
              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                backupAvatarTeamOrderList_ = newIntList();
                mutable_bitField0_ |= 0x00000001;
@@ -181,7 +181,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
              backupAvatarTeamOrderList_.addInt(input.readUInt32());
              break;
            }
-            case 66: {
+            case 98: {
              int length = input.readRawVarint32();
              int limit = input.pushLimit(length);
              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -209,7 +209,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        throw new com.google.protobuf.InvalidProtocolBufferException(
            e).setUnfinishedMessage(this);
      } finally {
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
          tempAvatarGuidList_.makeImmutable(); // C
        }
        if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -229,7 +229,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
    protected com.google.protobuf.MapField internalGetMapField(
        int number) {
      switch (number) {
-        case 3:
+        case 7:
          return internalGetAvatarTeamMap();
        default:
          throw new RuntimeException(
@@ -244,10 +244,10 @@ public final class AvatarTeamAllDataNotifyOuterClass {
              emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify.class, emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify.Builder.class);
    }

-    public static final int BACKUP_AVATAR_TEAM_ORDER_LIST_FIELD_NUMBER = 8;
+    public static final int BACKUP_AVATAR_TEAM_ORDER_LIST_FIELD_NUMBER = 12;
    private com.google.protobuf.Internal.IntList backupAvatarTeamOrderList_;
    /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 8;</code>
+     * <code>repeated uint32 backup_avatar_team_order_list = 12;</code>
     * @return A list containing the backupAvatarTeamOrderList.
     */
    @java.lang.Override
@@ -256,14 +256,14 @@ public final class AvatarTeamAllDataNotifyOuterClass {
      return backupAvatarTeamOrderList_;
    }
    /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 8;</code>
+     * <code>repeated uint32 backup_avatar_team_order_list = 12;</code>
     * @return The count of backupAvatarTeamOrderList.
     */
    public int getBackupAvatarTeamOrderListCount() {
      return backupAvatarTeamOrderList_.size();
    }
    /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 8;</code>
+     * <code>repeated uint32 backup_avatar_team_order_list = 12;</code>
     * @param index The index of the element to return.
     * @return The backupAvatarTeamOrderList at the given index.
     */
@@ -272,7 +272,35 @@ public final class AvatarTeamAllDataNotifyOuterClass {
    }
    private int backupAvatarTeamOrderListMemoizedSerializedSize = -1;

-    public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 3;
+    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 5;
+    private com.google.protobuf.Internal.LongList tempAvatarGuidList_;
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 5;</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 = 5;</code>
+     * @return The count of tempAvatarGuidList.
+     */
+    public int getTempAvatarGuidListCount() {
+      return tempAvatarGuidList_.size();
+    }
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 5;</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 =
@@ -299,7 +327,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
      return internalGetAvatarTeamMap().getMap().size();
    }
    /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
     */

    @java.lang.Override
@@ -317,7 +345,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
      return getAvatarTeamMapMap();
    }
    /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
     */
    @java.lang.Override

@@ -325,7 +353,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
      return internalGetAvatarTeamMap().getMap();
    }
    /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
     */
    @java.lang.Override

@@ -338,7 +366,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
      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 = 7;</code>
     */
    @java.lang.Override

@@ -353,34 +381,6 @@ public final class AvatarTeamAllDataNotifyOuterClass {
      return map.get(key);
    }

-    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 6;
-    private com.google.protobuf.Internal.LongList tempAvatarGuidList_;
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 6;</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 = 6;</code>
-     * @return The count of tempAvatarGuidList.
-     */
-    public int getTempAvatarGuidListCount() {
-      return tempAvatarGuidList_.size();
-    }
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 6;</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,21 +396,21 @@ public final class AvatarTeamAllDataNotifyOuterClass {
    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(50);
+        output.writeUInt32NoTag(42);
        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,
+          7);
      if (getBackupAvatarTeamOrderListList().size() > 0) {
-        output.writeUInt32NoTag(66);
+        output.writeUInt32NoTag(98);
        output.writeUInt32NoTag(backupAvatarTeamOrderListMemoizedSerializedSize);
      }
      for (int i = 0; i < backupAvatarTeamOrderList_.size(); i++) {
@@ -425,16 +425,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(3, avatarTeamMap__);
-      }
      {
        int dataSize = 0;
        for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
@@ -449,6 +439,16 @@ 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__);
+      }
      {
        int dataSize = 0;
        for (int i = 0; i < backupAvatarTeamOrderList_.size(); i++) {
@@ -480,10 +480,10 @@ public final class AvatarTeamAllDataNotifyOuterClass {

      if (!getBackupAvatarTeamOrderListList()
          .equals(other.getBackupAvatarTeamOrderListList())) return false;
-      if (!internalGetAvatarTeamMap().equals(
-          other.internalGetAvatarTeamMap())) return false;
      if (!getTempAvatarGuidListList()
          .equals(other.getTempAvatarGuidListList())) return false;
+      if (!internalGetAvatarTeamMap().equals(
+          other.internalGetAvatarTeamMap())) return false;
      if (!unknownFields.equals(other.unknownFields)) return false;
      return true;
    }
@@ -499,14 +499,14 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        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 (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 = (29 * hash) + unknownFields.hashCode();
      memoizedHashCode = hash;
      return hash;
@@ -604,8 +604,8 @@ public final class AvatarTeamAllDataNotifyOuterClass {
    }
    /**
     * <pre>
-     * Name: IKLIDEBOGPM
-     * CmdId: 1729
+     * CmdId: 1799
+     * Name: BBFCJICAALL
     * </pre>
     *
     * Protobuf type {@code AvatarTeamAllDataNotify}
@@ -623,7 +623,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
      protected com.google.protobuf.MapField internalGetMapField(
          int number) {
        switch (number) {
-          case 3:
+          case 7:
            return internalGetAvatarTeamMap();
          default:
            throw new RuntimeException(
@@ -634,7 +634,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
      protected com.google.protobuf.MapField internalGetMutableMapField(
          int number) {
        switch (number) {
-          case 3:
+          case 7:
            return internalGetMutableAvatarTeamMap();
          default:
            throw new RuntimeException(
@@ -669,9 +669,9 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        super.clear();
        backupAvatarTeamOrderList_ = emptyIntList();
        bitField0_ = (bitField0_ & ~0x00000001);
-        internalGetMutableAvatarTeamMap().clear();
        tempAvatarGuidList_ = emptyLongList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000002);
+        internalGetMutableAvatarTeamMap().clear();
        return this;
      }

@@ -704,13 +704,13 @@ public final class AvatarTeamAllDataNotifyOuterClass {
          bitField0_ = (bitField0_ & ~0x00000001);
        }
        result.backupAvatarTeamOrderList_ = backupAvatarTeamOrderList_;
-        result.avatarTeamMap_ = internalGetAvatarTeamMap();
-        result.avatarTeamMap_.makeImmutable();
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
          tempAvatarGuidList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000002);
        }
        result.tempAvatarGuidList_ = tempAvatarGuidList_;
+        result.avatarTeamMap_ = internalGetAvatarTeamMap();
+        result.avatarTeamMap_.makeImmutable();
        onBuilt();
        return result;
      }
@@ -769,18 +769,18 @@ public final class AvatarTeamAllDataNotifyOuterClass {
          }
          onChanged();
        }
-        internalGetMutableAvatarTeamMap().mergeFrom(
-            other.internalGetAvatarTeamMap());
        if (!other.tempAvatarGuidList_.isEmpty()) {
          if (tempAvatarGuidList_.isEmpty()) {
            tempAvatarGuidList_ = other.tempAvatarGuidList_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000002);
          } else {
            ensureTempAvatarGuidListIsMutable();
            tempAvatarGuidList_.addAll(other.tempAvatarGuidList_);
          }
          onChanged();
        }
+        internalGetMutableAvatarTeamMap().mergeFrom(
+            other.internalGetAvatarTeamMap());
        this.mergeUnknownFields(other.unknownFields);
        onChanged();
        return this;
@@ -819,7 +819,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         }
      }
      /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 8;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 12;</code>
       * @return A list containing the backupAvatarTeamOrderList.
       */
      public java.util.List<java.lang.Integer>
@@ -828,14 +828,14 @@ public final class AvatarTeamAllDataNotifyOuterClass {
                 java.util.Collections.unmodifiableList(backupAvatarTeamOrderList_) : backupAvatarTeamOrderList_;
      }
      /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 8;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 12;</code>
       * @return The count of backupAvatarTeamOrderList.
       */
      public int getBackupAvatarTeamOrderListCount() {
        return backupAvatarTeamOrderList_.size();
      }
      /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 8;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 12;</code>
       * @param index The index of the element to return.
       * @return The backupAvatarTeamOrderList at the given index.
       */
@@ -843,7 +843,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        return backupAvatarTeamOrderList_.getInt(index);
      }
      /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 8;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 12;</code>
       * @param index The index to set the value at.
       * @param value The backupAvatarTeamOrderList to set.
       * @return This builder for chaining.
@@ -856,7 +856,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        return this;
      }
      /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 8;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 12;</code>
       * @param value The backupAvatarTeamOrderList to add.
       * @return This builder for chaining.
       */
@@ -867,7 +867,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        return this;
      }
      /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 8;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 12;</code>
       * @param values The backupAvatarTeamOrderList to add.
       * @return This builder for chaining.
       */
@@ -880,7 +880,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        return this;
      }
      /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 8;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 12;</code>
       * @return This builder for chaining.
       */
      public Builder clearBackupAvatarTeamOrderList() {
@@ -890,6 +890,85 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        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 = 5;</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 = 5;</code>
+       * @return The count of tempAvatarGuidList.
+       */
+      public int getTempAvatarGuidListCount() {
+        return tempAvatarGuidList_.size();
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 5;</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 = 5;</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 = 5;</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 = 5;</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 = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTempAvatarGuidList() {
+        tempAvatarGuidList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        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>
@@ -917,7 +996,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        return internalGetAvatarTeamMap().getMap().size();
      }
      /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
       */

      @java.lang.Override
@@ -935,7 +1014,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        return getAvatarTeamMapMap();
      }
      /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
       */
      @java.lang.Override

@@ -943,7 +1022,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        return internalGetAvatarTeamMap().getMap();
      }
      /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
       */
      @java.lang.Override

@@ -956,7 +1035,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        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 = 7;</code>
       */
      @java.lang.Override

@@ -977,7 +1056,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        return this;
      }
      /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
       */

      public Builder removeAvatarTeamMap(
@@ -996,7 +1075,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        return internalGetMutableAvatarTeamMap().getMutableMap();
      }
      /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
       */
      public Builder putAvatarTeamMap(
          int key,
@@ -1008,7 +1087,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        return this;
      }
      /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
       */

      public Builder putAllAvatarTeamMap(
@@ -1017,85 +1096,6 @@ public final class AvatarTeamAllDataNotifyOuterClass {
            .putAll(values);
        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 = 6;</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 = 6;</code>
-       * @return The count of tempAvatarGuidList.
-       */
-      public int getTempAvatarGuidListCount() {
-        return tempAvatarGuidList_.size();
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 6;</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 = 6;</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 = 6;</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 = 6;</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 = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTempAvatarGuidList() {
-        tempAvatarGuidList_ = emptyLongList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-        return this;
-      }
      @java.lang.Override
      public final Builder setUnknownFields(
          final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1170,10 +1170,10 @@ public final class AvatarTeamAllDataNotifyOuterClass {
    java.lang.String[] descriptorData = {
      "\n\035AvatarTeamAllDataNotify.proto\032\020AvatarT" +
      "eam.proto\"\350\001\n\027AvatarTeamAllDataNotify\022%\n" +
-      "\035backup_avatar_team_order_list\030\010 \003(\r\022D\n\017" +
-      "avatar_team_map\030\003 \003(\0132+.AvatarTeamAllDat" +
-      "aNotify.AvatarTeamMapEntry\022\035\n\025temp_avata" +
-      "r_guid_list\030\006 \003(\004\032A\n\022AvatarTeamMapEntry\022" +
+      "\035backup_avatar_team_order_list\030\014 \003(\r\022\035\n\025" +
+      "temp_avatar_guid_list\030\005 \003(\004\022D\n\017avatar_te" +
+      "am_map\030\007 \003(\0132+.AvatarTeamAllDataNotify.A" +
+      "vatarTeamMapEntry\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"
@@ -1188,7 +1188,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
    internal_static_AvatarTeamAllDataNotify_fieldAccessorTable = new
      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
        internal_static_AvatarTeamAllDataNotify_descriptor,
-        new java.lang.String[] { "BackupAvatarTeamOrderList", "AvatarTeamMap", "TempAvatarGuidList", });
+        new java.lang.String[] { "BackupAvatarTeamOrderList", "TempAvatarGuidList", "AvatarTeamMap", });
    internal_static_AvatarTeamAllDataNotify_AvatarTeamMapEntry_descriptor =
      internal_static_AvatarTeamAllDataNotify_descriptor.getNestedTypes().get(0);
    internal_static_AvatarTeamAllDataNotify_AvatarTeamMapEntry_fieldAccessorTable = new