Add support for game version 3.6 (#2110)

* Update to game version `3.6.0` (pt. 1) not complete! * Update to game version `3.6.0` (pt. 2) not complete! * Update compiled definitions
2026-05-21 01:19:51 +08:00 · 2023-04-30 19:08:54 -07:00
parent 60e8106b01
commit c4f1208f45
1323 changed files with 434863 additions and 141164 deletions
@@ -19,21 +19,21 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
      com.google.protobuf.MessageOrBuilder {

    /**
-     * <code>uint32 activity_id = 5;</code>
-     * @return The activityId.
-     */
-    int getActivityId();
-
-    /**
-     * <code>uint32 watcher_id = 15;</code>
+     * <code>uint32 watcher_id = 8;</code>
     * @return The watcherId.
     */
    int getWatcherId();
+
+    /**
+     * <code>uint32 activity_id = 9;</code>
+     * @return The activityId.
+     */
+    int getActivityId();
  }
  /**
   * <pre>
-   * Name: DEADHMNJBHA
-   * CmdId: 2063
+   * CmdId: 2192
+   * Name: JCHMIGLBFBJ
   * </pre>
   *
   * Protobuf type {@code ActivityTakeWatcherRewardReq}
@@ -80,16 +80,16 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
            case 0:
              done = true;
              break;
-            case 40: {
-
-              activityId_ = input.readUInt32();
-              break;
-            }
-            case 120: {
+            case 64: {

              watcherId_ = input.readUInt32();
              break;
            }
+            case 72: {
+
+              activityId_ = input.readUInt32();
+              break;
+            }
            default: {
              if (!parseUnknownField(
                  input, unknownFields, extensionRegistry, tag)) {
@@ -122,21 +122,10 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
              emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq.class, emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq.Builder.class);
    }

-    public static final int ACTIVITY_ID_FIELD_NUMBER = 5;
-    private int activityId_;
-    /**
-     * <code>uint32 activity_id = 5;</code>
-     * @return The activityId.
-     */
-    @java.lang.Override
-    public int getActivityId() {
-      return activityId_;
-    }
-
-    public static final int WATCHER_ID_FIELD_NUMBER = 15;
+    public static final int WATCHER_ID_FIELD_NUMBER = 8;
    private int watcherId_;
    /**
-     * <code>uint32 watcher_id = 15;</code>
+     * <code>uint32 watcher_id = 8;</code>
     * @return The watcherId.
     */
    @java.lang.Override
@@ -144,6 +133,17 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
      return watcherId_;
    }

+    public static final int ACTIVITY_ID_FIELD_NUMBER = 9;
+    private int activityId_;
+    /**
+     * <code>uint32 activity_id = 9;</code>
+     * @return The activityId.
+     */
+    @java.lang.Override
+    public int getActivityId() {
+      return activityId_;
+    }
+
    private byte memoizedIsInitialized = -1;
    @java.lang.Override
    public final boolean isInitialized() {
@@ -158,11 +158,11 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
    @java.lang.Override
    public void writeTo(com.google.protobuf.CodedOutputStream output)
                        throws java.io.IOException {
-      if (activityId_ != 0) {
-        output.writeUInt32(5, activityId_);
-      }
      if (watcherId_ != 0) {
-        output.writeUInt32(15, watcherId_);
+        output.writeUInt32(8, watcherId_);
+      }
+      if (activityId_ != 0) {
+        output.writeUInt32(9, activityId_);
      }
      unknownFields.writeTo(output);
    }
@@ -173,13 +173,13 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
      if (size != -1) return size;

      size = 0;
-      if (activityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, activityId_);
-      }
      if (watcherId_ != 0) {
        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, watcherId_);
+          .computeUInt32Size(8, watcherId_);
+      }
+      if (activityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, activityId_);
      }
      size += unknownFields.getSerializedSize();
      memoizedSize = size;
@@ -196,10 +196,10 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
      }
      emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq other = (emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq) obj;

-      if (getActivityId()
-          != other.getActivityId()) return false;
      if (getWatcherId()
          != other.getWatcherId()) return false;
+      if (getActivityId()
+          != other.getActivityId()) return false;
      if (!unknownFields.equals(other.unknownFields)) return false;
      return true;
    }
@@ -211,10 +211,10 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
      }
      int hash = 41;
      hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getActivityId();
      hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
      hash = (53 * hash) + getWatcherId();
+      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getActivityId();
      hash = (29 * hash) + unknownFields.hashCode();
      memoizedHashCode = hash;
      return hash;
@@ -312,8 +312,8 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
    }
    /**
     * <pre>
-     * Name: DEADHMNJBHA
-     * CmdId: 2063
+     * CmdId: 2192
+     * Name: JCHMIGLBFBJ
     * </pre>
     *
     * Protobuf type {@code ActivityTakeWatcherRewardReq}
@@ -353,10 +353,10 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
      @java.lang.Override
      public Builder clear() {
        super.clear();
-        activityId_ = 0;
-
        watcherId_ = 0;

+        activityId_ = 0;
+
        return this;
      }

@@ -383,8 +383,8 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
      @java.lang.Override
      public emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq buildPartial() {
        emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq result = new emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq(this);
-        result.activityId_ = activityId_;
        result.watcherId_ = watcherId_;
+        result.activityId_ = activityId_;
        onBuilt();
        return result;
      }
@@ -433,12 +433,12 @@ public final class ActivityTakeWatcherRewardReqOuterClass {

      public Builder mergeFrom(emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq other) {
        if (other == emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq.getDefaultInstance()) return this;
-        if (other.getActivityId() != 0) {
-          setActivityId(other.getActivityId());
-        }
        if (other.getWatcherId() != 0) {
          setWatcherId(other.getWatcherId());
        }
+        if (other.getActivityId() != 0) {
+          setActivityId(other.getActivityId());
+        }
        this.mergeUnknownFields(other.unknownFields);
        onChanged();
        return this;
@@ -468,40 +468,9 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
        return this;
      }

-      private int activityId_ ;
-      /**
-       * <code>uint32 activity_id = 5;</code>
-       * @return The activityId.
-       */
-      @java.lang.Override
-      public int getActivityId() {
-        return activityId_;
-      }
-      /**
-       * <code>uint32 activity_id = 5;</code>
-       * @param value The activityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setActivityId(int value) {
-        
-        activityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 activity_id = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearActivityId() {
-        
-        activityId_ = 0;
-        onChanged();
-        return this;
-      }
-
      private int watcherId_ ;
      /**
-       * <code>uint32 watcher_id = 15;</code>
+       * <code>uint32 watcher_id = 8;</code>
       * @return The watcherId.
       */
      @java.lang.Override
@@ -509,7 +478,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
        return watcherId_;
      }
      /**
-       * <code>uint32 watcher_id = 15;</code>
+       * <code>uint32 watcher_id = 8;</code>
       * @param value The watcherId to set.
       * @return This builder for chaining.
       */
@@ -520,7 +489,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
        return this;
      }
      /**
-       * <code>uint32 watcher_id = 15;</code>
+       * <code>uint32 watcher_id = 8;</code>
       * @return This builder for chaining.
       */
      public Builder clearWatcherId() {
@@ -529,6 +498,37 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
        onChanged();
        return this;
      }
+
+      private int activityId_ ;
+      /**
+       * <code>uint32 activity_id = 9;</code>
+       * @return The activityId.
+       */
+      @java.lang.Override
+      public int getActivityId() {
+        return activityId_;
+      }
+      /**
+       * <code>uint32 activity_id = 9;</code>
+       * @param value The activityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setActivityId(int value) {
+        
+        activityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 activity_id = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearActivityId() {
+        
+        activityId_ = 0;
+        onChanged();
+        return this;
+      }
      @java.lang.Override
      public final Builder setUnknownFields(
          final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,8 +597,8 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
  static {
    java.lang.String[] descriptorData = {
      "\n\"ActivityTakeWatcherRewardReq.proto\"G\n\034" +
-      "ActivityTakeWatcherRewardReq\022\023\n\013activity" +
-      "_id\030\005 \001(\r\022\022\n\nwatcher_id\030\017 \001(\rB\033\n\031emu.gra" +
+      "ActivityTakeWatcherRewardReq\022\022\n\nwatcher_" +
+      "id\030\010 \001(\r\022\023\n\013activity_id\030\t \001(\rB\033\n\031emu.gra" +
      "sscutter.net.protob\006proto3"
    };
    descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +610,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
    internal_static_ActivityTakeWatcherRewardReq_fieldAccessorTable = new
      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
        internal_static_ActivityTakeWatcherRewardReq_descriptor,
-        new java.lang.String[] { "ActivityId", "WatcherId", });
+        new java.lang.String[] { "WatcherId", "ActivityId", });
  }

  // @@protoc_insertion_point(outer_class_scope)