Upgrade to REL3.7 (#2164)

* Remove hardcoded quest data

* Remove deprecated fields

* Try to fix packet

* Apply fix for token exchange

* Upgrade to REL3.7

* Add obfuscated protocol definitions

* Add missing enum (other protos too maybe)

* Re-add field setters and add note on removal

src/generated/main/java/emu/grasscutter/net/proto/GetAllH5ActivityInfoRspOuterClass.java

@@ -19,45 +19,45 @@ public final class GetAllH5ActivityInfoRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo> 
-        getH5ActivityInfoListList();
-    /**
-     * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
-     */
-    emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo getH5ActivityInfoList(int index);
-    /**
-     * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
-     */
-    int getH5ActivityInfoListCount();
-    /**
-     * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfoOrBuilder> 
-        getH5ActivityInfoListOrBuilderList();
-    /**
-     * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
-     */
-    emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfoOrBuilder getH5ActivityInfoListOrBuilder(
-        int index);
-
-    /**
-     * <code>int32 retcode = 7;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 client_red_dot_timestamp = 5;</code>
+     * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo> 
+        getH5ActivityInfoListList();
+    /**
+     * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
+     */
+    emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo getH5ActivityInfoList(int index);
+    /**
+     * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
+     */
+    int getH5ActivityInfoListCount();
+    /**
+     * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfoOrBuilder> 
+        getH5ActivityInfoListOrBuilderList();
+    /**
+     * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
+     */
+    emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfoOrBuilder getH5ActivityInfoListOrBuilder(
+        int index);
+
+    /**
+     * <code>uint32 client_red_dot_timestamp = 8;</code>
      * @return The clientRedDotTimestamp.
      */
     int getClientRedDotTimestamp();
   }
   /**
    * <pre>
-   * CmdId: 5659
-   * Name: LOFBJHDKDDA
+   * CmdId: 5678
+   * Obf: NNENDLPLIHI
    * </pre>
    *
    * Protobuf type {@code GetAllH5ActivityInfoRsp}
@@ -106,17 +106,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
-
-              clientRedDotTimestamp_ = input.readUInt32();
-              break;
-            }
-            case 56: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 74: {
+            case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 h5ActivityInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -125,6 +115,16 @@ public final class GetAllH5ActivityInfoRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo.parser(), extensionRegistry));
               break;
             }
+            case 48: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 64: {
+
+              clientRedDotTimestamp_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -160,50 +160,10 @@ public final class GetAllH5ActivityInfoRspOuterClass {
               emu.grasscutter.net.proto.GetAllH5ActivityInfoRspOuterClass.GetAllH5ActivityInfoRsp.class, emu.grasscutter.net.proto.GetAllH5ActivityInfoRspOuterClass.GetAllH5ActivityInfoRsp.Builder.class);
     }
 
-    public static final int H5_ACTIVITY_INFO_LIST_FIELD_NUMBER = 9;
-    private java.util.List<emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo> h5ActivityInfoList_;
-    /**
-     * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo> getH5ActivityInfoListList() {
-      return h5ActivityInfoList_;
-    }
-    /**
-     * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfoOrBuilder> 
-        getH5ActivityInfoListOrBuilderList() {
-      return h5ActivityInfoList_;
-    }
-    /**
-     * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
-     */
-    @java.lang.Override
-    public int getH5ActivityInfoListCount() {
-      return h5ActivityInfoList_.size();
-    }
-    /**
-     * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo getH5ActivityInfoList(int index) {
-      return h5ActivityInfoList_.get(index);
-    }
-    /**
-     * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfoOrBuilder getH5ActivityInfoListOrBuilder(
-        int index) {
-      return h5ActivityInfoList_.get(index);
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 7;
+    public static final int RETCODE_FIELD_NUMBER = 6;
     private int retcode_;
     /**
-     * <code>int32 retcode = 7;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -211,10 +171,50 @@ public final class GetAllH5ActivityInfoRspOuterClass {
       return retcode_;
     }
 
-    public static final int CLIENT_RED_DOT_TIMESTAMP_FIELD_NUMBER = 5;
+    public static final int H5_ACTIVITY_INFO_LIST_FIELD_NUMBER = 1;
+    private java.util.List<emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo> h5ActivityInfoList_;
+    /**
+     * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo> getH5ActivityInfoListList() {
+      return h5ActivityInfoList_;
+    }
+    /**
+     * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfoOrBuilder> 
+        getH5ActivityInfoListOrBuilderList() {
+      return h5ActivityInfoList_;
+    }
+    /**
+     * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
+     */
+    @java.lang.Override
+    public int getH5ActivityInfoListCount() {
+      return h5ActivityInfoList_.size();
+    }
+    /**
+     * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo getH5ActivityInfoList(int index) {
+      return h5ActivityInfoList_.get(index);
+    }
+    /**
+     * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfoOrBuilder getH5ActivityInfoListOrBuilder(
+        int index) {
+      return h5ActivityInfoList_.get(index);
+    }
+
+    public static final int CLIENT_RED_DOT_TIMESTAMP_FIELD_NUMBER = 8;
     private int clientRedDotTimestamp_;
     /**
-     * <code>uint32 client_red_dot_timestamp = 5;</code>
+     * <code>uint32 client_red_dot_timestamp = 8;</code>
      * @return The clientRedDotTimestamp.
      */
     @java.lang.Override
@@ -236,14 +236,14 @@ public final class GetAllH5ActivityInfoRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (clientRedDotTimestamp_ != 0) {
-        output.writeUInt32(5, clientRedDotTimestamp_);
+      for (int i = 0; i < h5ActivityInfoList_.size(); i++) {
+        output.writeMessage(1, h5ActivityInfoList_.get(i));
       }
       if (retcode_ != 0) {
-        output.writeInt32(7, retcode_);
+        output.writeInt32(6, retcode_);
       }
-      for (int i = 0; i < h5ActivityInfoList_.size(); i++) {
-        output.writeMessage(9, h5ActivityInfoList_.get(i));
+      if (clientRedDotTimestamp_ != 0) {
+        output.writeUInt32(8, clientRedDotTimestamp_);
       }
       unknownFields.writeTo(output);
     }
@@ -254,17 +254,17 @@ public final class GetAllH5ActivityInfoRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (clientRedDotTimestamp_ != 0) {
+      for (int i = 0; i < h5ActivityInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, clientRedDotTimestamp_);
+          .computeMessageSize(1, h5ActivityInfoList_.get(i));
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(7, retcode_);
+          .computeInt32Size(6, retcode_);
       }
-      for (int i = 0; i < h5ActivityInfoList_.size(); i++) {
+      if (clientRedDotTimestamp_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, h5ActivityInfoList_.get(i));
+          .computeUInt32Size(8, clientRedDotTimestamp_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -281,10 +281,10 @@ public final class GetAllH5ActivityInfoRspOuterClass {
       }
       emu.grasscutter.net.proto.GetAllH5ActivityInfoRspOuterClass.GetAllH5ActivityInfoRsp other = (emu.grasscutter.net.proto.GetAllH5ActivityInfoRspOuterClass.GetAllH5ActivityInfoRsp) obj;
 
-      if (!getH5ActivityInfoListList()
-          .equals(other.getH5ActivityInfoListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getH5ActivityInfoListList()
+          .equals(other.getH5ActivityInfoListList())) return false;
       if (getClientRedDotTimestamp()
           != other.getClientRedDotTimestamp()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -298,12 +298,12 @@ public final class GetAllH5ActivityInfoRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (getH5ActivityInfoListCount() > 0) {
         hash = (37 * hash) + H5_ACTIVITY_INFO_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getH5ActivityInfoListList().hashCode();
       }
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + CLIENT_RED_DOT_TIMESTAMP_FIELD_NUMBER;
       hash = (53 * hash) + getClientRedDotTimestamp();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -403,8 +403,8 @@ public final class GetAllH5ActivityInfoRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 5659
-     * Name: LOFBJHDKDDA
+     * CmdId: 5678
+     * Obf: NNENDLPLIHI
      * </pre>
      *
      * Protobuf type {@code GetAllH5ActivityInfoRsp}
@@ -445,14 +445,14 @@ public final class GetAllH5ActivityInfoRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        retcode_ = 0;
+
         if (h5ActivityInfoListBuilder_ == null) {
           h5ActivityInfoList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           h5ActivityInfoListBuilder_.clear();
         }
-        retcode_ = 0;
-
         clientRedDotTimestamp_ = 0;
 
         return this;
@@ -482,6 +482,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
       public emu.grasscutter.net.proto.GetAllH5ActivityInfoRspOuterClass.GetAllH5ActivityInfoRsp buildPartial() {
         emu.grasscutter.net.proto.GetAllH5ActivityInfoRspOuterClass.GetAllH5ActivityInfoRsp result = new emu.grasscutter.net.proto.GetAllH5ActivityInfoRspOuterClass.GetAllH5ActivityInfoRsp(this);
         int from_bitField0_ = bitField0_;
+        result.retcode_ = retcode_;
         if (h5ActivityInfoListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             h5ActivityInfoList_ = java.util.Collections.unmodifiableList(h5ActivityInfoList_);
@@ -491,7 +492,6 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         } else {
           result.h5ActivityInfoList_ = h5ActivityInfoListBuilder_.build();
         }
-        result.retcode_ = retcode_;
         result.clientRedDotTimestamp_ = clientRedDotTimestamp_;
         onBuilt();
         return result;
@@ -541,6 +541,9 @@ public final class GetAllH5ActivityInfoRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetAllH5ActivityInfoRspOuterClass.GetAllH5ActivityInfoRsp other) {
         if (other == emu.grasscutter.net.proto.GetAllH5ActivityInfoRspOuterClass.GetAllH5ActivityInfoRsp.getDefaultInstance()) return this;
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (h5ActivityInfoListBuilder_ == null) {
           if (!other.h5ActivityInfoList_.isEmpty()) {
             if (h5ActivityInfoList_.isEmpty()) {
@@ -567,9 +570,6 @@ public final class GetAllH5ActivityInfoRspOuterClass {
             }
           }
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getClientRedDotTimestamp() != 0) {
           setClientRedDotTimestamp(other.getClientRedDotTimestamp());
         }
@@ -603,6 +603,37 @@ public final class GetAllH5ActivityInfoRspOuterClass {
       }
       private int bitField0_;
 
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 6;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 6;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 retcode = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo> h5ActivityInfoList_ =
         java.util.Collections.emptyList();
       private void ensureH5ActivityInfoListIsMutable() {
@@ -616,7 +647,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
           emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo, emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo.Builder, emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfoOrBuilder> h5ActivityInfoListBuilder_;
 
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo> getH5ActivityInfoListList() {
         if (h5ActivityInfoListBuilder_ == null) {
@@ -626,7 +657,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public int getH5ActivityInfoListCount() {
         if (h5ActivityInfoListBuilder_ == null) {
@@ -636,7 +667,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo getH5ActivityInfoList(int index) {
         if (h5ActivityInfoListBuilder_ == null) {
@@ -646,7 +677,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public Builder setH5ActivityInfoList(
           int index, emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo value) {
@@ -663,7 +694,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public Builder setH5ActivityInfoList(
           int index, emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo.Builder builderForValue) {
@@ -677,7 +708,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public Builder addH5ActivityInfoList(emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo value) {
         if (h5ActivityInfoListBuilder_ == null) {
@@ -693,7 +724,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public Builder addH5ActivityInfoList(
           int index, emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo value) {
@@ -710,7 +741,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public Builder addH5ActivityInfoList(
           emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo.Builder builderForValue) {
@@ -724,7 +755,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public Builder addH5ActivityInfoList(
           int index, emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo.Builder builderForValue) {
@@ -738,7 +769,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public Builder addAllH5ActivityInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo> values) {
@@ -753,7 +784,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public Builder clearH5ActivityInfoList() {
         if (h5ActivityInfoListBuilder_ == null) {
@@ -766,7 +797,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public Builder removeH5ActivityInfoList(int index) {
         if (h5ActivityInfoListBuilder_ == null) {
@@ -779,14 +810,14 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo.Builder getH5ActivityInfoListBuilder(
           int index) {
         return getH5ActivityInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfoOrBuilder getH5ActivityInfoListOrBuilder(
           int index) {
@@ -796,7 +827,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfoOrBuilder> 
            getH5ActivityInfoListOrBuilderList() {
@@ -807,14 +838,14 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo.Builder addH5ActivityInfoListBuilder() {
         return getH5ActivityInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo.Builder addH5ActivityInfoListBuilder(
           int index) {
@@ -822,7 +853,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
             index, emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .H5ActivityInfo h5_activity_info_list = 9;</code>
+       * <code>repeated .H5ActivityInfo h5_activity_info_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.H5ActivityInfoOuterClass.H5ActivityInfo.Builder> 
            getH5ActivityInfoListBuilderList() {
@@ -843,40 +874,9 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         return h5ActivityInfoListBuilder_;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 7;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 7;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int clientRedDotTimestamp_ ;
       /**
-       * <code>uint32 client_red_dot_timestamp = 5;</code>
+       * <code>uint32 client_red_dot_timestamp = 8;</code>
        * @return The clientRedDotTimestamp.
        */
       @java.lang.Override
@@ -884,7 +884,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         return clientRedDotTimestamp_;
       }
       /**
-       * <code>uint32 client_red_dot_timestamp = 5;</code>
+       * <code>uint32 client_red_dot_timestamp = 8;</code>
        * @param value The clientRedDotTimestamp to set.
        * @return This builder for chaining.
        */
@@ -895,7 +895,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 client_red_dot_timestamp = 5;</code>
+       * <code>uint32 client_red_dot_timestamp = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearClientRedDotTimestamp() {
@@ -973,9 +973,9 @@ public final class GetAllH5ActivityInfoRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\035GetAllH5ActivityInfoRsp.proto\032\024H5Activ" +
       "ityInfo.proto\"|\n\027GetAllH5ActivityInfoRsp" +
-      "\022.\n\025h5_activity_info_list\030\t \003(\0132\017.H5Acti" +
-      "vityInfo\022\017\n\007retcode\030\007 \001(\005\022 \n\030client_red_" +
-      "dot_timestamp\030\005 \001(\rB\033\n\031emu.grasscutter.n" +
+      "\022\017\n\007retcode\030\006 \001(\005\022.\n\025h5_activity_info_li" +
+      "st\030\001 \003(\0132\017.H5ActivityInfo\022 \n\030client_red_" +
+      "dot_timestamp\030\010 \001(\rB\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -988,7 +988,7 @@ public final class GetAllH5ActivityInfoRspOuterClass {
     internal_static_GetAllH5ActivityInfoRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetAllH5ActivityInfoRsp_descriptor,
-        new java.lang.String[] { "H5ActivityInfoList", "Retcode", "ClientRedDotTimestamp", });
+        new java.lang.String[] { "Retcode", "H5ActivityInfoList", "ClientRedDotTimestamp", });
     emu.grasscutter.net.proto.H5ActivityInfoOuterClass.getDescriptor();
   }