Add new protocol definitions

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

    /**
-     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo> 
-        getOpenedOpActivityInfoListList();
-    /**
-     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
-     */
-    emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo getOpenedOpActivityInfoList(int index);
-    /**
-     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
-     */
-    int getOpenedOpActivityInfoListCount();
-    /**
-     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfoOrBuilder> 
-        getOpenedOpActivityInfoListOrBuilderList();
-    /**
-     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
-     */
-    emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfoOrBuilder getOpenedOpActivityInfoListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated uint32 finished_bonus_activity_id_list = 15;</code>
+     * <code>repeated uint32 finished_bonus_activity_id_list = 11;</code>
     * @return A list containing the finishedBonusActivityIdList.
     */
    java.util.List<java.lang.Integer> getFinishedBonusActivityIdListList();
    /**
-     * <code>repeated uint32 finished_bonus_activity_id_list = 15;</code>
+     * <code>repeated uint32 finished_bonus_activity_id_list = 11;</code>
     * @return The count of finishedBonusActivityIdList.
     */
    int getFinishedBonusActivityIdListCount();
    /**
-     * <code>repeated uint32 finished_bonus_activity_id_list = 15;</code>
+     * <code>repeated uint32 finished_bonus_activity_id_list = 11;</code>
     * @param index The index of the element to return.
     * @return The finishedBonusActivityIdList at the given index.
     */
    int getFinishedBonusActivityIdList(int index);
+
+    /**
+     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo> 
+        getOpenedOpActivityInfoListList();
+    /**
+     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
+     */
+    emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo getOpenedOpActivityInfoList(int index);
+    /**
+     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
+     */
+    int getOpenedOpActivityInfoListCount();
+    /**
+     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfoOrBuilder> 
+        getOpenedOpActivityInfoListOrBuilderList();
+    /**
+     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
+     */
+    emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfoOrBuilder getOpenedOpActivityInfoListOrBuilder(
+        int index);
  }
  /**
   * <pre>
-   * CmdId: 2575
-   * Obf: LJDJEHJPFGD
+   * CmdId: 24977
+   * Obf: AFHNMKDHELK
   * </pre>
   *
   * Protobuf type {@code OpActivityStateNotify}
@@ -77,8 +77,8 @@ public final class OpActivityStateNotifyOuterClass {
      super(builder);
    }
    private OpActivityStateNotify() {
-      openedOpActivityInfoList_ = java.util.Collections.emptyList();
      finishedBonusActivityIdList_ = emptyIntList();
+      openedOpActivityInfoList_ = java.util.Collections.emptyList();
    }

    @java.lang.Override
@@ -112,29 +112,29 @@ public final class OpActivityStateNotifyOuterClass {
            case 0:
              done = true;
              break;
-            case 42: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+            case 58: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                openedOpActivityInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo>();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
              }
              openedOpActivityInfoList_.add(
                  input.readMessage(emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo.parser(), extensionRegistry));
              break;
            }
-            case 120: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+            case 88: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                finishedBonusActivityIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
              }
              finishedBonusActivityIdList_.addInt(input.readUInt32());
              break;
            }
-            case 122: {
+            case 90: {
              int length = input.readRawVarint32();
              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
                finishedBonusActivityIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
              }
              while (input.getBytesUntilLimit() > 0) {
                finishedBonusActivityIdList_.addInt(input.readUInt32());
@@ -157,10 +157,10 @@ public final class OpActivityStateNotifyOuterClass {
        throw new com.google.protobuf.InvalidProtocolBufferException(
            e).setUnfinishedMessage(this);
      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
          openedOpActivityInfoList_ = java.util.Collections.unmodifiableList(openedOpActivityInfoList_);
        }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
          finishedBonusActivityIdList_.makeImmutable(); // C
        }
        this.unknownFields = unknownFields.build();
@@ -180,50 +180,10 @@ public final class OpActivityStateNotifyOuterClass {
              emu.grasscutter.net.proto.OpActivityStateNotifyOuterClass.OpActivityStateNotify.class, emu.grasscutter.net.proto.OpActivityStateNotifyOuterClass.OpActivityStateNotify.Builder.class);
    }

-    public static final int OPENED_OP_ACTIVITY_INFO_LIST_FIELD_NUMBER = 5;
-    private java.util.List<emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo> openedOpActivityInfoList_;
-    /**
-     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo> getOpenedOpActivityInfoListList() {
-      return openedOpActivityInfoList_;
-    }
-    /**
-     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfoOrBuilder> 
-        getOpenedOpActivityInfoListOrBuilderList() {
-      return openedOpActivityInfoList_;
-    }
-    /**
-     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
-     */
-    @java.lang.Override
-    public int getOpenedOpActivityInfoListCount() {
-      return openedOpActivityInfoList_.size();
-    }
-    /**
-     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo getOpenedOpActivityInfoList(int index) {
-      return openedOpActivityInfoList_.get(index);
-    }
-    /**
-     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfoOrBuilder getOpenedOpActivityInfoListOrBuilder(
-        int index) {
-      return openedOpActivityInfoList_.get(index);
-    }
-
-    public static final int FINISHED_BONUS_ACTIVITY_ID_LIST_FIELD_NUMBER = 15;
+    public static final int FINISHED_BONUS_ACTIVITY_ID_LIST_FIELD_NUMBER = 11;
    private com.google.protobuf.Internal.IntList finishedBonusActivityIdList_;
    /**
-     * <code>repeated uint32 finished_bonus_activity_id_list = 15;</code>
+     * <code>repeated uint32 finished_bonus_activity_id_list = 11;</code>
     * @return A list containing the finishedBonusActivityIdList.
     */
    @java.lang.Override
@@ -232,14 +192,14 @@ public final class OpActivityStateNotifyOuterClass {
      return finishedBonusActivityIdList_;
    }
    /**
-     * <code>repeated uint32 finished_bonus_activity_id_list = 15;</code>
+     * <code>repeated uint32 finished_bonus_activity_id_list = 11;</code>
     * @return The count of finishedBonusActivityIdList.
     */
    public int getFinishedBonusActivityIdListCount() {
      return finishedBonusActivityIdList_.size();
    }
    /**
-     * <code>repeated uint32 finished_bonus_activity_id_list = 15;</code>
+     * <code>repeated uint32 finished_bonus_activity_id_list = 11;</code>
     * @param index The index of the element to return.
     * @return The finishedBonusActivityIdList at the given index.
     */
@@ -248,6 +208,46 @@ public final class OpActivityStateNotifyOuterClass {
    }
    private int finishedBonusActivityIdListMemoizedSerializedSize = -1;

+    public static final int OPENED_OP_ACTIVITY_INFO_LIST_FIELD_NUMBER = 7;
+    private java.util.List<emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo> openedOpActivityInfoList_;
+    /**
+     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo> getOpenedOpActivityInfoListList() {
+      return openedOpActivityInfoList_;
+    }
+    /**
+     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfoOrBuilder> 
+        getOpenedOpActivityInfoListOrBuilderList() {
+      return openedOpActivityInfoList_;
+    }
+    /**
+     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
+     */
+    @java.lang.Override
+    public int getOpenedOpActivityInfoListCount() {
+      return openedOpActivityInfoList_.size();
+    }
+    /**
+     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo getOpenedOpActivityInfoList(int index) {
+      return openedOpActivityInfoList_.get(index);
+    }
+    /**
+     * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfoOrBuilder getOpenedOpActivityInfoListOrBuilder(
+        int index) {
+      return openedOpActivityInfoList_.get(index);
+    }
+
    private byte memoizedIsInitialized = -1;
    @java.lang.Override
    public final boolean isInitialized() {
@@ -264,10 +264,10 @@ public final class OpActivityStateNotifyOuterClass {
                        throws java.io.IOException {
      getSerializedSize();
      for (int i = 0; i < openedOpActivityInfoList_.size(); i++) {
-        output.writeMessage(5, openedOpActivityInfoList_.get(i));
+        output.writeMessage(7, openedOpActivityInfoList_.get(i));
      }
      if (getFinishedBonusActivityIdListList().size() > 0) {
-        output.writeUInt32NoTag(122);
+        output.writeUInt32NoTag(90);
        output.writeUInt32NoTag(finishedBonusActivityIdListMemoizedSerializedSize);
      }
      for (int i = 0; i < finishedBonusActivityIdList_.size(); i++) {
@@ -284,7 +284,7 @@ public final class OpActivityStateNotifyOuterClass {
      size = 0;
      for (int i = 0; i < openedOpActivityInfoList_.size(); i++) {
        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, openedOpActivityInfoList_.get(i));
+          .computeMessageSize(7, openedOpActivityInfoList_.get(i));
      }
      {
        int dataSize = 0;
@@ -315,10 +315,10 @@ public final class OpActivityStateNotifyOuterClass {
      }
      emu.grasscutter.net.proto.OpActivityStateNotifyOuterClass.OpActivityStateNotify other = (emu.grasscutter.net.proto.OpActivityStateNotifyOuterClass.OpActivityStateNotify) obj;

-      if (!getOpenedOpActivityInfoListList()
-          .equals(other.getOpenedOpActivityInfoListList())) return false;
      if (!getFinishedBonusActivityIdListList()
          .equals(other.getFinishedBonusActivityIdListList())) return false;
+      if (!getOpenedOpActivityInfoListList()
+          .equals(other.getOpenedOpActivityInfoListList())) return false;
      if (!unknownFields.equals(other.unknownFields)) return false;
      return true;
    }
@@ -330,14 +330,14 @@ public final class OpActivityStateNotifyOuterClass {
      }
      int hash = 41;
      hash = (19 * hash) + getDescriptor().hashCode();
-      if (getOpenedOpActivityInfoListCount() > 0) {
-        hash = (37 * hash) + OPENED_OP_ACTIVITY_INFO_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getOpenedOpActivityInfoListList().hashCode();
-      }
      if (getFinishedBonusActivityIdListCount() > 0) {
        hash = (37 * hash) + FINISHED_BONUS_ACTIVITY_ID_LIST_FIELD_NUMBER;
        hash = (53 * hash) + getFinishedBonusActivityIdListList().hashCode();
      }
+      if (getOpenedOpActivityInfoListCount() > 0) {
+        hash = (37 * hash) + OPENED_OP_ACTIVITY_INFO_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getOpenedOpActivityInfoListList().hashCode();
+      }
      hash = (29 * hash) + unknownFields.hashCode();
      memoizedHashCode = hash;
      return hash;
@@ -435,8 +435,8 @@ public final class OpActivityStateNotifyOuterClass {
    }
    /**
     * <pre>
-     * CmdId: 2575
-     * Obf: LJDJEHJPFGD
+     * CmdId: 24977
+     * Obf: AFHNMKDHELK
     * </pre>
     *
     * Protobuf type {@code OpActivityStateNotify}
@@ -477,14 +477,14 @@ public final class OpActivityStateNotifyOuterClass {
      @java.lang.Override
      public Builder clear() {
        super.clear();
+        finishedBonusActivityIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
        if (openedOpActivityInfoListBuilder_ == null) {
          openedOpActivityInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
        } else {
          openedOpActivityInfoListBuilder_.clear();
        }
-        finishedBonusActivityIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
        return this;
      }

@@ -512,20 +512,20 @@ public final class OpActivityStateNotifyOuterClass {
      public emu.grasscutter.net.proto.OpActivityStateNotifyOuterClass.OpActivityStateNotify buildPartial() {
        emu.grasscutter.net.proto.OpActivityStateNotifyOuterClass.OpActivityStateNotify result = new emu.grasscutter.net.proto.OpActivityStateNotifyOuterClass.OpActivityStateNotify(this);
        int from_bitField0_ = bitField0_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          finishedBonusActivityIdList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.finishedBonusActivityIdList_ = finishedBonusActivityIdList_;
        if (openedOpActivityInfoListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
+          if (((bitField0_ & 0x00000002) != 0)) {
            openedOpActivityInfoList_ = java.util.Collections.unmodifiableList(openedOpActivityInfoList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
          }
          result.openedOpActivityInfoList_ = openedOpActivityInfoList_;
        } else {
          result.openedOpActivityInfoList_ = openedOpActivityInfoListBuilder_.build();
        }
-        if (((bitField0_ & 0x00000002) != 0)) {
-          finishedBonusActivityIdList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.finishedBonusActivityIdList_ = finishedBonusActivityIdList_;
        onBuilt();
        return result;
      }
@@ -574,11 +574,21 @@ public final class OpActivityStateNotifyOuterClass {

      public Builder mergeFrom(emu.grasscutter.net.proto.OpActivityStateNotifyOuterClass.OpActivityStateNotify other) {
        if (other == emu.grasscutter.net.proto.OpActivityStateNotifyOuterClass.OpActivityStateNotify.getDefaultInstance()) return this;
+        if (!other.finishedBonusActivityIdList_.isEmpty()) {
+          if (finishedBonusActivityIdList_.isEmpty()) {
+            finishedBonusActivityIdList_ = other.finishedBonusActivityIdList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureFinishedBonusActivityIdListIsMutable();
+            finishedBonusActivityIdList_.addAll(other.finishedBonusActivityIdList_);
+          }
+          onChanged();
+        }
        if (openedOpActivityInfoListBuilder_ == null) {
          if (!other.openedOpActivityInfoList_.isEmpty()) {
            if (openedOpActivityInfoList_.isEmpty()) {
              openedOpActivityInfoList_ = other.openedOpActivityInfoList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
            } else {
              ensureOpenedOpActivityInfoListIsMutable();
              openedOpActivityInfoList_.addAll(other.openedOpActivityInfoList_);
@@ -591,7 +601,7 @@ public final class OpActivityStateNotifyOuterClass {
              openedOpActivityInfoListBuilder_.dispose();
              openedOpActivityInfoListBuilder_ = null;
              openedOpActivityInfoList_ = other.openedOpActivityInfoList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
              openedOpActivityInfoListBuilder_ = 
                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                   getOpenedOpActivityInfoListFieldBuilder() : null;
@@ -600,16 +610,6 @@ public final class OpActivityStateNotifyOuterClass {
            }
          }
        }
-        if (!other.finishedBonusActivityIdList_.isEmpty()) {
-          if (finishedBonusActivityIdList_.isEmpty()) {
-            finishedBonusActivityIdList_ = other.finishedBonusActivityIdList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureFinishedBonusActivityIdListIsMutable();
-            finishedBonusActivityIdList_.addAll(other.finishedBonusActivityIdList_);
-          }
-          onChanged();
-        }
        this.mergeUnknownFields(other.unknownFields);
        onChanged();
        return this;
@@ -640,12 +640,91 @@ public final class OpActivityStateNotifyOuterClass {
      }
      private int bitField0_;

+      private com.google.protobuf.Internal.IntList finishedBonusActivityIdList_ = emptyIntList();
+      private void ensureFinishedBonusActivityIdListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          finishedBonusActivityIdList_ = mutableCopy(finishedBonusActivityIdList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 finished_bonus_activity_id_list = 11;</code>
+       * @return A list containing the finishedBonusActivityIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getFinishedBonusActivityIdListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(finishedBonusActivityIdList_) : finishedBonusActivityIdList_;
+      }
+      /**
+       * <code>repeated uint32 finished_bonus_activity_id_list = 11;</code>
+       * @return The count of finishedBonusActivityIdList.
+       */
+      public int getFinishedBonusActivityIdListCount() {
+        return finishedBonusActivityIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 finished_bonus_activity_id_list = 11;</code>
+       * @param index The index of the element to return.
+       * @return The finishedBonusActivityIdList at the given index.
+       */
+      public int getFinishedBonusActivityIdList(int index) {
+        return finishedBonusActivityIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 finished_bonus_activity_id_list = 11;</code>
+       * @param index The index to set the value at.
+       * @param value The finishedBonusActivityIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFinishedBonusActivityIdList(
+          int index, int value) {
+        ensureFinishedBonusActivityIdListIsMutable();
+        finishedBonusActivityIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 finished_bonus_activity_id_list = 11;</code>
+       * @param value The finishedBonusActivityIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addFinishedBonusActivityIdList(int value) {
+        ensureFinishedBonusActivityIdListIsMutable();
+        finishedBonusActivityIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 finished_bonus_activity_id_list = 11;</code>
+       * @param values The finishedBonusActivityIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllFinishedBonusActivityIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureFinishedBonusActivityIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, finishedBonusActivityIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 finished_bonus_activity_id_list = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFinishedBonusActivityIdList() {
+        finishedBonusActivityIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
      private java.util.List<emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo> openedOpActivityInfoList_ =
        java.util.Collections.emptyList();
      private void ensureOpenedOpActivityInfoListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
          openedOpActivityInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo>(openedOpActivityInfoList_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000002;
         }
      }

@@ -653,7 +732,7 @@ public final class OpActivityStateNotifyOuterClass {
          emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo, emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo.Builder, emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfoOrBuilder> openedOpActivityInfoListBuilder_;

      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public java.util.List<emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo> getOpenedOpActivityInfoListList() {
        if (openedOpActivityInfoListBuilder_ == null) {
@@ -663,7 +742,7 @@ public final class OpActivityStateNotifyOuterClass {
        }
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public int getOpenedOpActivityInfoListCount() {
        if (openedOpActivityInfoListBuilder_ == null) {
@@ -673,7 +752,7 @@ public final class OpActivityStateNotifyOuterClass {
        }
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo getOpenedOpActivityInfoList(int index) {
        if (openedOpActivityInfoListBuilder_ == null) {
@@ -683,7 +762,7 @@ public final class OpActivityStateNotifyOuterClass {
        }
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public Builder setOpenedOpActivityInfoList(
          int index, emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo value) {
@@ -700,7 +779,7 @@ public final class OpActivityStateNotifyOuterClass {
        return this;
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public Builder setOpenedOpActivityInfoList(
          int index, emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo.Builder builderForValue) {
@@ -714,7 +793,7 @@ public final class OpActivityStateNotifyOuterClass {
        return this;
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public Builder addOpenedOpActivityInfoList(emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo value) {
        if (openedOpActivityInfoListBuilder_ == null) {
@@ -730,7 +809,7 @@ public final class OpActivityStateNotifyOuterClass {
        return this;
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public Builder addOpenedOpActivityInfoList(
          int index, emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo value) {
@@ -747,7 +826,7 @@ public final class OpActivityStateNotifyOuterClass {
        return this;
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public Builder addOpenedOpActivityInfoList(
          emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo.Builder builderForValue) {
@@ -761,7 +840,7 @@ public final class OpActivityStateNotifyOuterClass {
        return this;
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public Builder addOpenedOpActivityInfoList(
          int index, emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo.Builder builderForValue) {
@@ -775,7 +854,7 @@ public final class OpActivityStateNotifyOuterClass {
        return this;
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public Builder addAllOpenedOpActivityInfoList(
          java.lang.Iterable<? extends emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo> values) {
@@ -790,12 +869,12 @@ public final class OpActivityStateNotifyOuterClass {
        return this;
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public Builder clearOpenedOpActivityInfoList() {
        if (openedOpActivityInfoListBuilder_ == null) {
          openedOpActivityInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
          onChanged();
        } else {
          openedOpActivityInfoListBuilder_.clear();
@@ -803,7 +882,7 @@ public final class OpActivityStateNotifyOuterClass {
        return this;
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public Builder removeOpenedOpActivityInfoList(int index) {
        if (openedOpActivityInfoListBuilder_ == null) {
@@ -816,14 +895,14 @@ public final class OpActivityStateNotifyOuterClass {
        return this;
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo.Builder getOpenedOpActivityInfoListBuilder(
          int index) {
        return getOpenedOpActivityInfoListFieldBuilder().getBuilder(index);
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfoOrBuilder getOpenedOpActivityInfoListOrBuilder(
          int index) {
@@ -833,7 +912,7 @@ public final class OpActivityStateNotifyOuterClass {
        }
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public java.util.List<? extends emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfoOrBuilder> 
           getOpenedOpActivityInfoListOrBuilderList() {
@@ -844,14 +923,14 @@ public final class OpActivityStateNotifyOuterClass {
        }
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo.Builder addOpenedOpActivityInfoListBuilder() {
        return getOpenedOpActivityInfoListFieldBuilder().addBuilder(
            emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo.getDefaultInstance());
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo.Builder addOpenedOpActivityInfoListBuilder(
          int index) {
@@ -859,7 +938,7 @@ public final class OpActivityStateNotifyOuterClass {
            index, emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo.getDefaultInstance());
      }
      /**
-       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 5;</code>
+       * <code>repeated .OpActivityTagBriefInfo opened_op_activity_info_list = 7;</code>
       */
      public java.util.List<emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo.Builder> 
           getOpenedOpActivityInfoListBuilderList() {
@@ -872,92 +951,13 @@ public final class OpActivityStateNotifyOuterClass {
          openedOpActivityInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
              emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo, emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfo.Builder, emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.OpActivityTagBriefInfoOrBuilder>(
                  openedOpActivityInfoList_,
-                  ((bitField0_ & 0x00000001) != 0),
+                  ((bitField0_ & 0x00000002) != 0),
                  getParentForChildren(),
                  isClean());
          openedOpActivityInfoList_ = null;
        }
        return openedOpActivityInfoListBuilder_;
      }
-
-      private com.google.protobuf.Internal.IntList finishedBonusActivityIdList_ = emptyIntList();
-      private void ensureFinishedBonusActivityIdListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          finishedBonusActivityIdList_ = mutableCopy(finishedBonusActivityIdList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 finished_bonus_activity_id_list = 15;</code>
-       * @return A list containing the finishedBonusActivityIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getFinishedBonusActivityIdListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(finishedBonusActivityIdList_) : finishedBonusActivityIdList_;
-      }
-      /**
-       * <code>repeated uint32 finished_bonus_activity_id_list = 15;</code>
-       * @return The count of finishedBonusActivityIdList.
-       */
-      public int getFinishedBonusActivityIdListCount() {
-        return finishedBonusActivityIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 finished_bonus_activity_id_list = 15;</code>
-       * @param index The index of the element to return.
-       * @return The finishedBonusActivityIdList at the given index.
-       */
-      public int getFinishedBonusActivityIdList(int index) {
-        return finishedBonusActivityIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 finished_bonus_activity_id_list = 15;</code>
-       * @param index The index to set the value at.
-       * @param value The finishedBonusActivityIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFinishedBonusActivityIdList(
-          int index, int value) {
-        ensureFinishedBonusActivityIdListIsMutable();
-        finishedBonusActivityIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 finished_bonus_activity_id_list = 15;</code>
-       * @param value The finishedBonusActivityIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addFinishedBonusActivityIdList(int value) {
-        ensureFinishedBonusActivityIdListIsMutable();
-        finishedBonusActivityIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 finished_bonus_activity_id_list = 15;</code>
-       * @param values The finishedBonusActivityIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllFinishedBonusActivityIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureFinishedBonusActivityIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, finishedBonusActivityIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 finished_bonus_activity_id_list = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFinishedBonusActivityIdList() {
-        finishedBonusActivityIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
      @java.lang.Override
      public final Builder setUnknownFields(
          final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1027,9 +1027,9 @@ public final class OpActivityStateNotifyOuterClass {
    java.lang.String[] descriptorData = {
      "\n\033OpActivityStateNotify.proto\032\034OpActivit" +
      "yTagBriefInfo.proto\"\177\n\025OpActivityStateNo" +
-      "tify\022=\n\034opened_op_activity_info_list\030\005 \003" +
-      "(\0132\027.OpActivityTagBriefInfo\022\'\n\037finished_" +
-      "bonus_activity_id_list\030\017 \003(\rB\033\n\031emu.gras" +
+      "tify\022\'\n\037finished_bonus_activity_id_list\030" +
+      "\013 \003(\r\022=\n\034opened_op_activity_info_list\030\007 " +
+      "\003(\0132\027.OpActivityTagBriefInfoB\033\n\031emu.gras" +
      "scutter.net.protob\006proto3"
    };
    descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1042,7 +1042,7 @@ public final class OpActivityStateNotifyOuterClass {
    internal_static_OpActivityStateNotify_fieldAccessorTable = new
      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
        internal_static_OpActivityStateNotify_descriptor,
-        new java.lang.String[] { "OpenedOpActivityInfoList", "FinishedBonusActivityIdList", });
+        new java.lang.String[] { "FinishedBonusActivityIdList", "OpenedOpActivityInfoList", });
    emu.grasscutter.net.proto.OpActivityTagBriefInfoOuterClass.getDescriptor();
  }