Add new protocol definitions

2026-06-05 09:54:14 +08:00 · 2023-08-14 18:57:07 -04:00
parent 1bcb79840c
commit ceeaf3748a
3772 changed files with 448618 additions and 1108926 deletions
@@ -19,44 +19,44 @@ public final class TeamEnterSceneInfoOuterClass {
      com.google.protobuf.MessageOrBuilder {

    /**
-     * <code>uint32 team_entity_id = 6;</code>
+     * <code>uint32 team_entity_id = 5;</code>
     * @return The teamEntityId.
     */
    int getTeamEntityId();

    /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-     * @return Whether the teamAbilityInfo field is set.
-     */
-    boolean hasTeamAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-     * @return The teamAbilityInfo.
-     */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-     */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder();
-
-    /**
-     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * <code>.AbilityControlBlock ability_control_block = 7;</code>
     * @return Whether the abilityControlBlock field is set.
     */
    boolean hasAbilityControlBlock();
    /**
-     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * <code>.AbilityControlBlock ability_control_block = 7;</code>
     * @return The abilityControlBlock.
     */
    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
    /**
-     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * <code>.AbilityControlBlock ability_control_block = 7;</code>
     */
    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
+
+    /**
+     * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+     * @return Whether the teamAbilityInfo field is set.
+     */
+    boolean hasTeamAbilityInfo();
+    /**
+     * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+     * @return The teamAbilityInfo.
+     */
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo();
+    /**
+     * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+     */
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder();
  }
  /**
   * <pre>
-   * Obf: CIPMBEDPLNL
+   * Obf: PMLNKMHJPKI
   * </pre>
   *
   * Protobuf type {@code TeamEnterSceneInfo}
@@ -103,7 +103,12 @@ public final class TeamEnterSceneInfoOuterClass {
            case 0:
              done = true;
              break;
-            case 42: {
+            case 40: {
+
+              teamEntityId_ = input.readUInt32();
+              break;
+            }
+            case 58: {
              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
              if (abilityControlBlock_ != null) {
                subBuilder = abilityControlBlock_.toBuilder();
@@ -116,12 +121,7 @@ public final class TeamEnterSceneInfoOuterClass {

              break;
            }
-            case 48: {
-
-              teamEntityId_ = input.readUInt32();
-              break;
-            }
-            case 82: {
+            case 66: {
              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
              if (teamAbilityInfo_ != null) {
                subBuilder = teamAbilityInfo_.toBuilder();
@@ -166,10 +166,10 @@ public final class TeamEnterSceneInfoOuterClass {
              emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.class, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder.class);
    }

-    public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 6;
+    public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 5;
    private int teamEntityId_;
    /**
-     * <code>uint32 team_entity_id = 6;</code>
+     * <code>uint32 team_entity_id = 5;</code>
     * @return The teamEntityId.
     */
    @java.lang.Override
@@ -177,36 +177,10 @@ public final class TeamEnterSceneInfoOuterClass {
      return teamEntityId_;
    }

-    public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 10;
-    private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
-    /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-     * @return Whether the teamAbilityInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasTeamAbilityInfo() {
-      return teamAbilityInfo_ != null;
-    }
-    /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-     * @return The teamAbilityInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo() {
-      return teamAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : teamAbilityInfo_;
-    }
-    /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
-      return getTeamAbilityInfo();
-    }
-
-    public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 5;
+    public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 7;
    private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
    /**
-     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * <code>.AbilityControlBlock ability_control_block = 7;</code>
     * @return Whether the abilityControlBlock field is set.
     */
    @java.lang.Override
@@ -214,7 +188,7 @@ public final class TeamEnterSceneInfoOuterClass {
      return abilityControlBlock_ != null;
    }
    /**
-     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * <code>.AbilityControlBlock ability_control_block = 7;</code>
     * @return The abilityControlBlock.
     */
    @java.lang.Override
@@ -222,13 +196,39 @@ public final class TeamEnterSceneInfoOuterClass {
      return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
    }
    /**
-     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * <code>.AbilityControlBlock ability_control_block = 7;</code>
     */
    @java.lang.Override
    public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
      return getAbilityControlBlock();
    }

+    public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 8;
+    private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
+    /**
+     * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+     * @return Whether the teamAbilityInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasTeamAbilityInfo() {
+      return teamAbilityInfo_ != null;
+    }
+    /**
+     * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+     * @return The teamAbilityInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo() {
+      return teamAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : teamAbilityInfo_;
+    }
+    /**
+     * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
+      return getTeamAbilityInfo();
+    }
+
    private byte memoizedIsInitialized = -1;
    @java.lang.Override
    public final boolean isInitialized() {
@@ -243,14 +243,14 @@ public final class TeamEnterSceneInfoOuterClass {
    @java.lang.Override
    public void writeTo(com.google.protobuf.CodedOutputStream output)
                        throws java.io.IOException {
-      if (abilityControlBlock_ != null) {
-        output.writeMessage(5, getAbilityControlBlock());
-      }
      if (teamEntityId_ != 0) {
-        output.writeUInt32(6, teamEntityId_);
+        output.writeUInt32(5, teamEntityId_);
+      }
+      if (abilityControlBlock_ != null) {
+        output.writeMessage(7, getAbilityControlBlock());
      }
      if (teamAbilityInfo_ != null) {
-        output.writeMessage(10, getTeamAbilityInfo());
+        output.writeMessage(8, getTeamAbilityInfo());
      }
      unknownFields.writeTo(output);
    }
@@ -261,17 +261,17 @@ public final class TeamEnterSceneInfoOuterClass {
      if (size != -1) return size;

      size = 0;
-      if (abilityControlBlock_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getAbilityControlBlock());
-      }
      if (teamEntityId_ != 0) {
        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, teamEntityId_);
+          .computeUInt32Size(5, teamEntityId_);
+      }
+      if (abilityControlBlock_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(7, getAbilityControlBlock());
      }
      if (teamAbilityInfo_ != null) {
        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, getTeamAbilityInfo());
+          .computeMessageSize(8, getTeamAbilityInfo());
      }
      size += unknownFields.getSerializedSize();
      memoizedSize = size;
@@ -290,16 +290,16 @@ public final class TeamEnterSceneInfoOuterClass {

      if (getTeamEntityId()
          != other.getTeamEntityId()) return false;
-      if (hasTeamAbilityInfo() != other.hasTeamAbilityInfo()) return false;
-      if (hasTeamAbilityInfo()) {
-        if (!getTeamAbilityInfo()
-            .equals(other.getTeamAbilityInfo())) return false;
-      }
      if (hasAbilityControlBlock() != other.hasAbilityControlBlock()) return false;
      if (hasAbilityControlBlock()) {
        if (!getAbilityControlBlock()
            .equals(other.getAbilityControlBlock())) return false;
      }
+      if (hasTeamAbilityInfo() != other.hasTeamAbilityInfo()) return false;
+      if (hasTeamAbilityInfo()) {
+        if (!getTeamAbilityInfo()
+            .equals(other.getTeamAbilityInfo())) return false;
+      }
      if (!unknownFields.equals(other.unknownFields)) return false;
      return true;
    }
@@ -313,14 +313,14 @@ public final class TeamEnterSceneInfoOuterClass {
      hash = (19 * hash) + getDescriptor().hashCode();
      hash = (37 * hash) + TEAM_ENTITY_ID_FIELD_NUMBER;
      hash = (53 * hash) + getTeamEntityId();
-      if (hasTeamAbilityInfo()) {
-        hash = (37 * hash) + TEAM_ABILITY_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getTeamAbilityInfo().hashCode();
-      }
      if (hasAbilityControlBlock()) {
        hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
        hash = (53 * hash) + getAbilityControlBlock().hashCode();
      }
+      if (hasTeamAbilityInfo()) {
+        hash = (37 * hash) + TEAM_ABILITY_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getTeamAbilityInfo().hashCode();
+      }
      hash = (29 * hash) + unknownFields.hashCode();
      memoizedHashCode = hash;
      return hash;
@@ -418,7 +418,7 @@ public final class TeamEnterSceneInfoOuterClass {
    }
    /**
     * <pre>
-     * Obf: CIPMBEDPLNL
+     * Obf: PMLNKMHJPKI
     * </pre>
     *
     * Protobuf type {@code TeamEnterSceneInfo}
@@ -460,18 +460,18 @@ public final class TeamEnterSceneInfoOuterClass {
        super.clear();
        teamEntityId_ = 0;

-        if (teamAbilityInfoBuilder_ == null) {
-          teamAbilityInfo_ = null;
-        } else {
-          teamAbilityInfo_ = null;
-          teamAbilityInfoBuilder_ = null;
-        }
        if (abilityControlBlockBuilder_ == null) {
          abilityControlBlock_ = null;
        } else {
          abilityControlBlock_ = null;
          abilityControlBlockBuilder_ = null;
        }
+        if (teamAbilityInfoBuilder_ == null) {
+          teamAbilityInfo_ = null;
+        } else {
+          teamAbilityInfo_ = null;
+          teamAbilityInfoBuilder_ = null;
+        }
        return this;
      }

@@ -499,16 +499,16 @@ public final class TeamEnterSceneInfoOuterClass {
      public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo buildPartial() {
        emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo result = new emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo(this);
        result.teamEntityId_ = teamEntityId_;
-        if (teamAbilityInfoBuilder_ == null) {
-          result.teamAbilityInfo_ = teamAbilityInfo_;
-        } else {
-          result.teamAbilityInfo_ = teamAbilityInfoBuilder_.build();
-        }
        if (abilityControlBlockBuilder_ == null) {
          result.abilityControlBlock_ = abilityControlBlock_;
        } else {
          result.abilityControlBlock_ = abilityControlBlockBuilder_.build();
        }
+        if (teamAbilityInfoBuilder_ == null) {
+          result.teamAbilityInfo_ = teamAbilityInfo_;
+        } else {
+          result.teamAbilityInfo_ = teamAbilityInfoBuilder_.build();
+        }
        onBuilt();
        return result;
      }
@@ -560,12 +560,12 @@ public final class TeamEnterSceneInfoOuterClass {
        if (other.getTeamEntityId() != 0) {
          setTeamEntityId(other.getTeamEntityId());
        }
-        if (other.hasTeamAbilityInfo()) {
-          mergeTeamAbilityInfo(other.getTeamAbilityInfo());
-        }
        if (other.hasAbilityControlBlock()) {
          mergeAbilityControlBlock(other.getAbilityControlBlock());
        }
+        if (other.hasTeamAbilityInfo()) {
+          mergeTeamAbilityInfo(other.getTeamAbilityInfo());
+        }
        this.mergeUnknownFields(other.unknownFields);
        onChanged();
        return this;
@@ -597,7 +597,7 @@ public final class TeamEnterSceneInfoOuterClass {

      private int teamEntityId_ ;
      /**
-       * <code>uint32 team_entity_id = 6;</code>
+       * <code>uint32 team_entity_id = 5;</code>
       * @return The teamEntityId.
       */
      @java.lang.Override
@@ -605,7 +605,7 @@ public final class TeamEnterSceneInfoOuterClass {
        return teamEntityId_;
      }
      /**
-       * <code>uint32 team_entity_id = 6;</code>
+       * <code>uint32 team_entity_id = 5;</code>
       * @param value The teamEntityId to set.
       * @return This builder for chaining.
       */
@@ -616,7 +616,7 @@ public final class TeamEnterSceneInfoOuterClass {
        return this;
      }
      /**
-       * <code>uint32 team_entity_id = 6;</code>
+       * <code>uint32 team_entity_id = 5;</code>
       * @return This builder for chaining.
       */
      public Builder clearTeamEntityId() {
@@ -626,137 +626,18 @@ public final class TeamEnterSceneInfoOuterClass {
        return this;
      }

-      private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> teamAbilityInfoBuilder_;
-      /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-       * @return Whether the teamAbilityInfo field is set.
-       */
-      public boolean hasTeamAbilityInfo() {
-        return teamAbilityInfoBuilder_ != null || teamAbilityInfo_ != null;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-       * @return The teamAbilityInfo.
-       */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo() {
-        if (teamAbilityInfoBuilder_ == null) {
-          return teamAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : teamAbilityInfo_;
-        } else {
-          return teamAbilityInfoBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-       */
-      public Builder setTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
-        if (teamAbilityInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          teamAbilityInfo_ = value;
-          onChanged();
-        } else {
-          teamAbilityInfoBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-       */
-      public Builder setTeamAbilityInfo(
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
-        if (teamAbilityInfoBuilder_ == null) {
-          teamAbilityInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          teamAbilityInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-       */
-      public Builder mergeTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
-        if (teamAbilityInfoBuilder_ == null) {
-          if (teamAbilityInfo_ != null) {
-            teamAbilityInfo_ =
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.newBuilder(teamAbilityInfo_).mergeFrom(value).buildPartial();
-          } else {
-            teamAbilityInfo_ = value;
-          }
-          onChanged();
-        } else {
-          teamAbilityInfoBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-       */
-      public Builder clearTeamAbilityInfo() {
-        if (teamAbilityInfoBuilder_ == null) {
-          teamAbilityInfo_ = null;
-          onChanged();
-        } else {
-          teamAbilityInfo_ = null;
-          teamAbilityInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-       */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getTeamAbilityInfoBuilder() {
-        
-        onChanged();
-        return getTeamAbilityInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-       */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
-        if (teamAbilityInfoBuilder_ != null) {
-          return teamAbilityInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return teamAbilityInfo_ == null ?
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : teamAbilityInfo_;
-        }
-      }
-      /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 10;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> 
-          getTeamAbilityInfoFieldBuilder() {
-        if (teamAbilityInfoBuilder_ == null) {
-          teamAbilityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder>(
-                  getTeamAbilityInfo(),
-                  getParentForChildren(),
-                  isClean());
-          teamAbilityInfo_ = null;
-        }
-        return teamAbilityInfoBuilder_;
-      }
-
      private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
      private com.google.protobuf.SingleFieldBuilderV3<
          emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> abilityControlBlockBuilder_;
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock ability_control_block = 7;</code>
       * @return Whether the abilityControlBlock field is set.
       */
      public boolean hasAbilityControlBlock() {
        return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock ability_control_block = 7;</code>
       * @return The abilityControlBlock.
       */
      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
@@ -767,7 +648,7 @@ public final class TeamEnterSceneInfoOuterClass {
        }
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock ability_control_block = 7;</code>
       */
      public Builder setAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
        if (abilityControlBlockBuilder_ == null) {
@@ -783,7 +664,7 @@ public final class TeamEnterSceneInfoOuterClass {
        return this;
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock ability_control_block = 7;</code>
       */
      public Builder setAbilityControlBlock(
          emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder builderForValue) {
@@ -797,7 +678,7 @@ public final class TeamEnterSceneInfoOuterClass {
        return this;
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock ability_control_block = 7;</code>
       */
      public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
        if (abilityControlBlockBuilder_ == null) {
@@ -815,7 +696,7 @@ public final class TeamEnterSceneInfoOuterClass {
        return this;
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock ability_control_block = 7;</code>
       */
      public Builder clearAbilityControlBlock() {
        if (abilityControlBlockBuilder_ == null) {
@@ -829,7 +710,7 @@ public final class TeamEnterSceneInfoOuterClass {
        return this;
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock ability_control_block = 7;</code>
       */
      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
        
@@ -837,7 +718,7 @@ public final class TeamEnterSceneInfoOuterClass {
        return getAbilityControlBlockFieldBuilder().getBuilder();
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock ability_control_block = 7;</code>
       */
      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
        if (abilityControlBlockBuilder_ != null) {
@@ -848,7 +729,7 @@ public final class TeamEnterSceneInfoOuterClass {
        }
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock ability_control_block = 7;</code>
       */
      private com.google.protobuf.SingleFieldBuilderV3<
          emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> 
@@ -863,6 +744,125 @@ public final class TeamEnterSceneInfoOuterClass {
        }
        return abilityControlBlockBuilder_;
      }
+
+      private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> teamAbilityInfoBuilder_;
+      /**
+       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       * @return Whether the teamAbilityInfo field is set.
+       */
+      public boolean hasTeamAbilityInfo() {
+        return teamAbilityInfoBuilder_ != null || teamAbilityInfo_ != null;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       * @return The teamAbilityInfo.
+       */
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo() {
+        if (teamAbilityInfoBuilder_ == null) {
+          return teamAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : teamAbilityInfo_;
+        } else {
+          return teamAbilityInfoBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       */
+      public Builder setTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
+        if (teamAbilityInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          teamAbilityInfo_ = value;
+          onChanged();
+        } else {
+          teamAbilityInfoBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       */
+      public Builder setTeamAbilityInfo(
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
+        if (teamAbilityInfoBuilder_ == null) {
+          teamAbilityInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          teamAbilityInfoBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       */
+      public Builder mergeTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
+        if (teamAbilityInfoBuilder_ == null) {
+          if (teamAbilityInfo_ != null) {
+            teamAbilityInfo_ =
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.newBuilder(teamAbilityInfo_).mergeFrom(value).buildPartial();
+          } else {
+            teamAbilityInfo_ = value;
+          }
+          onChanged();
+        } else {
+          teamAbilityInfoBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       */
+      public Builder clearTeamAbilityInfo() {
+        if (teamAbilityInfoBuilder_ == null) {
+          teamAbilityInfo_ = null;
+          onChanged();
+        } else {
+          teamAbilityInfo_ = null;
+          teamAbilityInfoBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       */
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getTeamAbilityInfoBuilder() {
+        
+        onChanged();
+        return getTeamAbilityInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       */
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
+        if (teamAbilityInfoBuilder_ != null) {
+          return teamAbilityInfoBuilder_.getMessageOrBuilder();
+        } else {
+          return teamAbilityInfo_ == null ?
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : teamAbilityInfo_;
+        }
+      }
+      /**
+       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> 
+          getTeamAbilityInfoFieldBuilder() {
+        if (teamAbilityInfoBuilder_ == null) {
+          teamAbilityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder>(
+                  getTeamAbilityInfo(),
+                  getParentForChildren(),
+                  isClean());
+          teamAbilityInfo_ = null;
+        }
+        return teamAbilityInfoBuilder_;
+      }
      @java.lang.Override
      public final Builder setUnknownFields(
          final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -930,28 +930,28 @@ public final class TeamEnterSceneInfoOuterClass {
      descriptor;
  static {
    java.lang.String[] descriptorData = {
-      "\n\030TeamEnterSceneInfo.proto\032\032AbilitySyncS" +
-      "tateInfo.proto\032\031AbilityControlBlock.prot" +
+      "\n\030TeamEnterSceneInfo.proto\032\031AbilityContr" +
+      "olBlock.proto\032\032AbilitySyncStateInfo.prot" +
      "o\"\223\001\n\022TeamEnterSceneInfo\022\026\n\016team_entity_" +
-      "id\030\006 \001(\r\0220\n\021team_ability_info\030\n \001(\0132\025.Ab" +
-      "ilitySyncStateInfo\0223\n\025ability_control_bl" +
-      "ock\030\005 \001(\0132\024.AbilityControlBlockB\033\n\031emu.g" +
+      "id\030\005 \001(\r\0223\n\025ability_control_block\030\007 \001(\0132" +
+      "\024.AbilityControlBlock\0220\n\021team_ability_in" +
+      "fo\030\010 \001(\0132\025.AbilitySyncStateInfoB\033\n\031emu.g" +
      "rasscutter.net.protob\006proto3"
    };
    descriptor = com.google.protobuf.Descriptors.FileDescriptor
      .internalBuildGeneratedFileFrom(descriptorData,
        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor(),
          emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor(),
        });
    internal_static_TeamEnterSceneInfo_descriptor =
      getDescriptor().getMessageTypes().get(0);
    internal_static_TeamEnterSceneInfo_fieldAccessorTable = new
      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
        internal_static_TeamEnterSceneInfo_descriptor,
-        new java.lang.String[] { "TeamEntityId", "TeamAbilityInfo", "AbilityControlBlock", });
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
+        new java.lang.String[] { "TeamEntityId", "AbilityControlBlock", "TeamAbilityInfo", });
    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
  }

  // @@protoc_insertion_point(outer_class_scope)