update gc 3.4 (#2041)

* update 3.4 * update3.4 * update 3.4 * update 3.4 * Add files via upload * Delete SetPropCommand.java * update 3.4 area id * update version * exchange cmdid * exchange cmdid * exchange cmdid * my fault * update AiSyncInfo
2026-06-05 09:45:03 +08:00 · 2023-02-19 11:18:27 +08:00
parent 39b4aa1387
commit 71a1e31d37
1191 changed files with 459994 additions and 172995 deletions
@@ -19,40 +19,40 @@ public final class TeamEnterSceneInfoOuterClass {
      com.google.protobuf.MessageOrBuilder {

    /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
-     * @return Whether the teamAbilityInfo field is set.
+     * <code>uint32 teamEntityId = 4;</code>
+     * @return The teamEntityId.
     */
-    boolean hasTeamAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
-     * @return The teamAbilityInfo.
-     */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
-     */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder();
+    int getTeamEntityId();

    /**
-     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * <code>.AbilityControlBlock abilityControlBlock = 12;</code>
     * @return Whether the abilityControlBlock field is set.
     */
    boolean hasAbilityControlBlock();
    /**
-     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * <code>.AbilityControlBlock abilityControlBlock = 12;</code>
     * @return The abilityControlBlock.
     */
    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
    /**
-     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * <code>.AbilityControlBlock abilityControlBlock = 12;</code>
     */
    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();

    /**
-     * <code>uint32 team_entity_id = 11;</code>
-     * @return The teamEntityId.
+     * <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
+     * @return Whether the teamAbilityInfo field is set.
     */
-    int getTeamEntityId();
+    boolean hasTeamAbilityInfo();
+    /**
+     * <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
+     * @return The teamAbilityInfo.
+     */
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo();
+    /**
+     * <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
+     */
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder();
  }
  /**
   * Protobuf type {@code TeamEnterSceneInfo}
@@ -99,20 +99,12 @@ public final class TeamEnterSceneInfoOuterClass {
            case 0:
              done = true;
              break;
-            case 42: {
-              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
-              if (abilityControlBlock_ != null) {
-                subBuilder = abilityControlBlock_.toBuilder();
-              }
-              abilityControlBlock_ = input.readMessage(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(abilityControlBlock_);
-                abilityControlBlock_ = subBuilder.buildPartial();
-              }
+            case 32: {

+              teamEntityId_ = input.readUInt32();
              break;
            }
-            case 50: {
+            case 82: {
              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
              if (teamAbilityInfo_ != null) {
                subBuilder = teamAbilityInfo_.toBuilder();
@@ -125,9 +117,17 @@ public final class TeamEnterSceneInfoOuterClass {

              break;
            }
-            case 88: {
+            case 98: {
+              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
+              if (abilityControlBlock_ != null) {
+                subBuilder = abilityControlBlock_.toBuilder();
+              }
+              abilityControlBlock_ = input.readMessage(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(abilityControlBlock_);
+                abilityControlBlock_ = subBuilder.buildPartial();
+              }

-              teamEntityId_ = input.readUInt32();
              break;
            }
            default: {
@@ -162,36 +162,21 @@ public final class TeamEnterSceneInfoOuterClass {
              emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.class, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder.class);
    }

-    public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 6;
-    private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
+    public static final int TEAMENTITYID_FIELD_NUMBER = 4;
+    private int teamEntityId_;
    /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
-     * @return Whether the teamAbilityInfo field is set.
+     * <code>uint32 teamEntityId = 4;</code>
+     * @return The teamEntityId.
     */
    @java.lang.Override
-    public boolean hasTeamAbilityInfo() {
-      return teamAbilityInfo_ != null;
-    }
-    /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 6;</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 = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
-      return getTeamAbilityInfo();
+    public int getTeamEntityId() {
+      return teamEntityId_;
    }

-    public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 5;
+    public static final int ABILITYCONTROLBLOCK_FIELD_NUMBER = 12;
    private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
    /**
-     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * <code>.AbilityControlBlock abilityControlBlock = 12;</code>
     * @return Whether the abilityControlBlock field is set.
     */
    @java.lang.Override
@@ -199,7 +184,7 @@ public final class TeamEnterSceneInfoOuterClass {
      return abilityControlBlock_ != null;
    }
    /**
-     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * <code>.AbilityControlBlock abilityControlBlock = 12;</code>
     * @return The abilityControlBlock.
     */
    @java.lang.Override
@@ -207,22 +192,37 @@ public final class TeamEnterSceneInfoOuterClass {
      return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
    }
    /**
-     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * <code>.AbilityControlBlock abilityControlBlock = 12;</code>
     */
    @java.lang.Override
    public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
      return getAbilityControlBlock();
    }

-    public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 11;
-    private int teamEntityId_;
+    public static final int TEAMABILITYINFO_FIELD_NUMBER = 10;
+    private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
    /**
-     * <code>uint32 team_entity_id = 11;</code>
-     * @return The teamEntityId.
+     * <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
+     * @return Whether the teamAbilityInfo field is set.
     */
    @java.lang.Override
-    public int getTeamEntityId() {
-      return teamEntityId_;
+    public boolean hasTeamAbilityInfo() {
+      return teamAbilityInfo_ != null;
+    }
+    /**
+     * <code>.AbilitySyncStateInfo teamAbilityInfo = 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 teamAbilityInfo = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
+      return getTeamAbilityInfo();
    }

    private byte memoizedIsInitialized = -1;
@@ -239,14 +239,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(4, teamEntityId_);
      }
      if (teamAbilityInfo_ != null) {
-        output.writeMessage(6, getTeamAbilityInfo());
+        output.writeMessage(10, getTeamAbilityInfo());
      }
-      if (teamEntityId_ != 0) {
-        output.writeUInt32(11, teamEntityId_);
+      if (abilityControlBlock_ != null) {
+        output.writeMessage(12, getAbilityControlBlock());
      }
      unknownFields.writeTo(output);
    }
@@ -257,17 +257,17 @@ public final class TeamEnterSceneInfoOuterClass {
      if (size != -1) return size;

      size = 0;
-      if (abilityControlBlock_ != null) {
+      if (teamEntityId_ != 0) {
        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getAbilityControlBlock());
+          .computeUInt32Size(4, teamEntityId_);
      }
      if (teamAbilityInfo_ != null) {
        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getTeamAbilityInfo());
+          .computeMessageSize(10, getTeamAbilityInfo());
      }
-      if (teamEntityId_ != 0) {
+      if (abilityControlBlock_ != null) {
        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, teamEntityId_);
+          .computeMessageSize(12, getAbilityControlBlock());
      }
      size += unknownFields.getSerializedSize();
      memoizedSize = size;
@@ -284,18 +284,18 @@ public final class TeamEnterSceneInfoOuterClass {
      }
      emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo other = (emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo) obj;

-      if (hasTeamAbilityInfo() != other.hasTeamAbilityInfo()) return false;
-      if (hasTeamAbilityInfo()) {
-        if (!getTeamAbilityInfo()
-            .equals(other.getTeamAbilityInfo())) return false;
-      }
+      if (getTeamEntityId()
+          != other.getTeamEntityId()) return false;
      if (hasAbilityControlBlock() != other.hasAbilityControlBlock()) return false;
      if (hasAbilityControlBlock()) {
        if (!getAbilityControlBlock()
            .equals(other.getAbilityControlBlock())) return false;
      }
-      if (getTeamEntityId()
-          != other.getTeamEntityId()) 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;
    }
@@ -307,16 +307,16 @@ public final class TeamEnterSceneInfoOuterClass {
      }
      int hash = 41;
      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasTeamAbilityInfo()) {
-        hash = (37 * hash) + TEAM_ABILITY_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getTeamAbilityInfo().hashCode();
-      }
+      hash = (37 * hash) + TEAMENTITYID_FIELD_NUMBER;
+      hash = (53 * hash) + getTeamEntityId();
      if (hasAbilityControlBlock()) {
-        hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
+        hash = (37 * hash) + ABILITYCONTROLBLOCK_FIELD_NUMBER;
        hash = (53 * hash) + getAbilityControlBlock().hashCode();
      }
-      hash = (37 * hash) + TEAM_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getTeamEntityId();
+      if (hasTeamAbilityInfo()) {
+        hash = (37 * hash) + TEAMABILITYINFO_FIELD_NUMBER;
+        hash = (53 * hash) + getTeamAbilityInfo().hashCode();
+      }
      hash = (29 * hash) + unknownFields.hashCode();
      memoizedHashCode = hash;
      return hash;
@@ -450,20 +450,20 @@ public final class TeamEnterSceneInfoOuterClass {
      @java.lang.Override
      public Builder clear() {
        super.clear();
-        if (teamAbilityInfoBuilder_ == null) {
-          teamAbilityInfo_ = null;
-        } else {
-          teamAbilityInfo_ = null;
-          teamAbilityInfoBuilder_ = null;
-        }
+        teamEntityId_ = 0;
+
        if (abilityControlBlockBuilder_ == null) {
          abilityControlBlock_ = null;
        } else {
          abilityControlBlock_ = null;
          abilityControlBlockBuilder_ = null;
        }
-        teamEntityId_ = 0;
-
+        if (teamAbilityInfoBuilder_ == null) {
+          teamAbilityInfo_ = null;
+        } else {
+          teamAbilityInfo_ = null;
+          teamAbilityInfoBuilder_ = null;
+        }
        return this;
      }

@@ -490,17 +490,17 @@ public final class TeamEnterSceneInfoOuterClass {
      @java.lang.Override
      public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo buildPartial() {
        emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo result = new emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo(this);
-        if (teamAbilityInfoBuilder_ == null) {
-          result.teamAbilityInfo_ = teamAbilityInfo_;
-        } else {
-          result.teamAbilityInfo_ = teamAbilityInfoBuilder_.build();
-        }
+        result.teamEntityId_ = teamEntityId_;
        if (abilityControlBlockBuilder_ == null) {
          result.abilityControlBlock_ = abilityControlBlock_;
        } else {
          result.abilityControlBlock_ = abilityControlBlockBuilder_.build();
        }
-        result.teamEntityId_ = teamEntityId_;
+        if (teamAbilityInfoBuilder_ == null) {
+          result.teamAbilityInfo_ = teamAbilityInfo_;
+        } else {
+          result.teamAbilityInfo_ = teamAbilityInfoBuilder_.build();
+        }
        onBuilt();
        return result;
      }
@@ -549,14 +549,14 @@ public final class TeamEnterSceneInfoOuterClass {

      public Builder mergeFrom(emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo other) {
        if (other == emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.getDefaultInstance()) return this;
-        if (other.hasTeamAbilityInfo()) {
-          mergeTeamAbilityInfo(other.getTeamAbilityInfo());
+        if (other.getTeamEntityId() != 0) {
+          setTeamEntityId(other.getTeamEntityId());
        }
        if (other.hasAbilityControlBlock()) {
          mergeAbilityControlBlock(other.getAbilityControlBlock());
        }
-        if (other.getTeamEntityId() != 0) {
-          setTeamEntityId(other.getTeamEntityId());
+        if (other.hasTeamAbilityInfo()) {
+          mergeTeamAbilityInfo(other.getTeamAbilityInfo());
        }
        this.mergeUnknownFields(other.unknownFields);
        onChanged();
@@ -587,137 +587,49 @@ 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_;
+      private int teamEntityId_ ;
      /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
-       * @return Whether the teamAbilityInfo field is set.
+       * <code>uint32 teamEntityId = 4;</code>
+       * @return The teamEntityId.
       */
-      public boolean hasTeamAbilityInfo() {
-        return teamAbilityInfoBuilder_ != null || teamAbilityInfo_ != null;
+      @java.lang.Override
+      public int getTeamEntityId() {
+        return teamEntityId_;
      }
      /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
-       * @return The teamAbilityInfo.
+       * <code>uint32 teamEntityId = 4;</code>
+       * @param value The teamEntityId to set.
+       * @return This builder for chaining.
       */
-      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 = 6;</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 = 6;</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 = 6;</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 = 6;</code>
-       */
-      public Builder clearTeamAbilityInfo() {
-        if (teamAbilityInfoBuilder_ == null) {
-          teamAbilityInfo_ = null;
-          onChanged();
-        } else {
-          teamAbilityInfo_ = null;
-          teamAbilityInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
-       */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getTeamAbilityInfoBuilder() {
+      public Builder setTeamEntityId(int value) {
        
+        teamEntityId_ = value;
        onChanged();
-        return getTeamAbilityInfoFieldBuilder().getBuilder();
+        return this;
      }
      /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 6;</code>
+       * <code>uint32 teamEntityId = 4;</code>
+       * @return This builder for chaining.
       */
-      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 = 6;</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_;
+      public Builder clearTeamEntityId() {
+        
+        teamEntityId_ = 0;
+        onChanged();
+        return this;
      }

      private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
      private com.google.protobuf.SingleFieldBuilderV3<
          emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> abilityControlBlockBuilder_;
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock abilityControlBlock = 12;</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 abilityControlBlock = 12;</code>
       * @return The abilityControlBlock.
       */
      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
@@ -728,7 +640,7 @@ public final class TeamEnterSceneInfoOuterClass {
        }
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock abilityControlBlock = 12;</code>
       */
      public Builder setAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
        if (abilityControlBlockBuilder_ == null) {
@@ -744,7 +656,7 @@ public final class TeamEnterSceneInfoOuterClass {
        return this;
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock abilityControlBlock = 12;</code>
       */
      public Builder setAbilityControlBlock(
          emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder builderForValue) {
@@ -758,7 +670,7 @@ public final class TeamEnterSceneInfoOuterClass {
        return this;
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock abilityControlBlock = 12;</code>
       */
      public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
        if (abilityControlBlockBuilder_ == null) {
@@ -776,7 +688,7 @@ public final class TeamEnterSceneInfoOuterClass {
        return this;
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock abilityControlBlock = 12;</code>
       */
      public Builder clearAbilityControlBlock() {
        if (abilityControlBlockBuilder_ == null) {
@@ -790,7 +702,7 @@ public final class TeamEnterSceneInfoOuterClass {
        return this;
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock abilityControlBlock = 12;</code>
       */
      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
        
@@ -798,7 +710,7 @@ public final class TeamEnterSceneInfoOuterClass {
        return getAbilityControlBlockFieldBuilder().getBuilder();
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock abilityControlBlock = 12;</code>
       */
      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
        if (abilityControlBlockBuilder_ != null) {
@@ -809,7 +721,7 @@ public final class TeamEnterSceneInfoOuterClass {
        }
      }
      /**
-       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * <code>.AbilityControlBlock abilityControlBlock = 12;</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> 
@@ -825,36 +737,124 @@ public final class TeamEnterSceneInfoOuterClass {
        return abilityControlBlockBuilder_;
      }

-      private int teamEntityId_ ;
+      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>uint32 team_entity_id = 11;</code>
-       * @return The teamEntityId.
+       * <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
+       * @return Whether the teamAbilityInfo field is set.
       */
-      @java.lang.Override
-      public int getTeamEntityId() {
-        return teamEntityId_;
+      public boolean hasTeamAbilityInfo() {
+        return teamAbilityInfoBuilder_ != null || teamAbilityInfo_ != null;
      }
      /**
-       * <code>uint32 team_entity_id = 11;</code>
-       * @param value The teamEntityId to set.
-       * @return This builder for chaining.
+       * <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
+       * @return The teamAbilityInfo.
       */
-      public Builder setTeamEntityId(int value) {
-        
-        teamEntityId_ = value;
-        onChanged();
+      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 teamAbilityInfo = 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>uint32 team_entity_id = 11;</code>
-       * @return This builder for chaining.
+       * <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
       */
-      public Builder clearTeamEntityId() {
-        
-        teamEntityId_ = 0;
-        onChanged();
+      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 teamAbilityInfo = 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 teamAbilityInfo = 10;</code>
+       */
+      public Builder clearTeamAbilityInfo() {
+        if (teamAbilityInfoBuilder_ == null) {
+          teamAbilityInfo_ = null;
+          onChanged();
+        } else {
+          teamAbilityInfo_ = null;
+          teamAbilityInfoBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo teamAbilityInfo = 10;</code>
+       */
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getTeamAbilityInfoBuilder() {
+        
+        onChanged();
+        return getTeamAbilityInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.AbilitySyncStateInfo teamAbilityInfo = 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 teamAbilityInfo = 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_;
+      }
      @java.lang.Override
      public final Builder setUnknownFields(
          final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -924,11 +924,11 @@ public final class TeamEnterSceneInfoOuterClass {
    java.lang.String[] descriptorData = {
      "\n\030TeamEnterSceneInfo.proto\032\031AbilityContr" +
      "olBlock.proto\032\032AbilitySyncStateInfo.prot" +
-      "o\"\223\001\n\022TeamEnterSceneInfo\0220\n\021team_ability" +
-      "_info\030\006 \001(\0132\025.AbilitySyncStateInfo\0223\n\025ab" +
-      "ility_control_block\030\005 \001(\0132\024.AbilityContr" +
-      "olBlock\022\026\n\016team_entity_id\030\013 \001(\rB\033\n\031emu.g" +
-      "rasscutter.net.protob\006proto3"
+      "o\"\215\001\n\022TeamEnterSceneInfo\022\024\n\014teamEntityId" +
+      "\030\004 \001(\r\0221\n\023abilityControlBlock\030\014 \001(\0132\024.Ab" +
+      "ilityControlBlock\022.\n\017teamAbilityInfo\030\n \001" +
+      "(\0132\025.AbilitySyncStateInfoB\033\n\031emu.grasscu" +
+      "tter.net.protob\006proto3"
    };
    descriptor = com.google.protobuf.Descriptors.FileDescriptor
      .internalBuildGeneratedFileFrom(descriptorData,
@@ -941,7 +941,7 @@ public final class TeamEnterSceneInfoOuterClass {
    internal_static_TeamEnterSceneInfo_fieldAccessorTable = new
      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
        internal_static_TeamEnterSceneInfo_descriptor,
-        new java.lang.String[] { "TeamAbilityInfo", "AbilityControlBlock", "TeamEntityId", });
+        new java.lang.String[] { "TeamEntityId", "AbilityControlBlock", "TeamAbilityInfo", });
    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor();
    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
  }