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/AvatarUpgradeRspOuterClass.java

@@ -19,11 +19,11 @@ public final class AvatarUpgradeRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
      */
     int getOldFightPropMapCount();
     /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
      */
     boolean containsOldFightPropMap(
         int key);
@@ -34,26 +34,26 @@ public final class AvatarUpgradeRspOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Float>
     getOldFightPropMap();
     /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Float>
     getOldFightPropMapMap();
     /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
      */
 
     float getOldFightPropMapOrDefault(
         int key,
         float defaultValue);
     /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
      */
 
     float getOldFightPropMapOrThrow(
         int key);
 
     /**
-     * <code>uint64 avatar_guid = 2;</code>
+     * <code>uint64 avatar_guid = 8;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
@@ -65,23 +65,11 @@ public final class AvatarUpgradeRspOuterClass {
     int getCurLevel();
 
     /**
-     * <code>int32 retcode = 6;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 old_level = 1;</code>
-     * @return The oldLevel.
-     */
-    int getOldLevel();
-
-    /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
      */
     int getCurFightPropMapCount();
     /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
      */
     boolean containsCurFightPropMap(
         int key);
@@ -92,28 +80,40 @@ public final class AvatarUpgradeRspOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Float>
     getCurFightPropMap();
     /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Float>
     getCurFightPropMapMap();
     /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
      */
 
     float getCurFightPropMapOrDefault(
         int key,
         float defaultValue);
     /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
      */
 
     float getCurFightPropMapOrThrow(
         int key);
+
+    /**
+     * <code>int32 retcode = 10;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>uint32 old_level = 4;</code>
+     * @return The oldLevel.
+     */
+    int getOldLevel();
   }
   /**
    * <pre>
-   * CmdId: 1651
-   * Name: AGJOJDPCHDG
+   * CmdId: 1695
+   * Obf: JJBMNICCKDE
    * </pre>
    *
    * Protobuf type {@code AvatarUpgradeRsp}
@@ -161,22 +161,35 @@ public final class AvatarUpgradeRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 32: {
 
               oldLevel_ = input.readUInt32();
               break;
             }
-            case 16: {
+            case 64: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 48: {
+            case 80: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 82: {
+            case 98: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                oldFightPropMap_ = com.google.protobuf.MapField.newMapField(
+                    OldFightPropMapDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
+              oldFightPropMap__ = input.readMessage(
+                  OldFightPropMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              oldFightPropMap_.getMutableMap().put(
+                  oldFightPropMap__.getKey(), oldFightPropMap__.getValue());
+              break;
+            }
+            case 106: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 curFightPropMap_ = com.google.protobuf.MapField.newMapField(
                     CurFightPropMapDefaultEntryHolder.defaultEntry);
@@ -194,19 +207,6 @@ public final class AvatarUpgradeRspOuterClass {
               curLevel_ = input.readUInt32();
               break;
             }
-            case 122: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                oldFightPropMap_ = com.google.protobuf.MapField.newMapField(
-                    OldFightPropMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
-              }
-              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
-              oldFightPropMap__ = input.readMessage(
-                  OldFightPropMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              oldFightPropMap_.getMutableMap().put(
-                  oldFightPropMap__.getKey(), oldFightPropMap__.getValue());
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -236,9 +236,9 @@ public final class AvatarUpgradeRspOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 15:
+        case 12:
           return internalGetOldFightPropMap();
-        case 10:
+        case 13:
           return internalGetCurFightPropMap();
         default:
           throw new RuntimeException(
@@ -253,7 +253,7 @@ public final class AvatarUpgradeRspOuterClass {
               emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.AvatarUpgradeRsp.class, emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.AvatarUpgradeRsp.Builder.class);
     }
 
-    public static final int OLD_FIGHT_PROP_MAP_FIELD_NUMBER = 15;
+    public static final int OLD_FIGHT_PROP_MAP_FIELD_NUMBER = 12;
     private static final class OldFightPropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Float> defaultEntry =
@@ -280,7 +280,7 @@ public final class AvatarUpgradeRspOuterClass {
       return internalGetOldFightPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
      */
 
     @java.lang.Override
@@ -298,7 +298,7 @@ public final class AvatarUpgradeRspOuterClass {
       return getOldFightPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
      */
     @java.lang.Override
 
@@ -306,7 +306,7 @@ public final class AvatarUpgradeRspOuterClass {
       return internalGetOldFightPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
      */
     @java.lang.Override
 
@@ -319,7 +319,7 @@ public final class AvatarUpgradeRspOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
      */
     @java.lang.Override
 
@@ -334,10 +334,10 @@ public final class AvatarUpgradeRspOuterClass {
       return map.get(key);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 2;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 8;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 2;</code>
+     * <code>uint64 avatar_guid = 8;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -356,29 +356,7 @@ public final class AvatarUpgradeRspOuterClass {
       return curLevel_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 6;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 6;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int OLD_LEVEL_FIELD_NUMBER = 1;
-    private int oldLevel_;
-    /**
-     * <code>uint32 old_level = 1;</code>
-     * @return The oldLevel.
-     */
-    @java.lang.Override
-    public int getOldLevel() {
-      return oldLevel_;
-    }
-
-    public static final int CUR_FIGHT_PROP_MAP_FIELD_NUMBER = 10;
+    public static final int CUR_FIGHT_PROP_MAP_FIELD_NUMBER = 13;
     private static final class CurFightPropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Float> defaultEntry =
@@ -405,7 +383,7 @@ public final class AvatarUpgradeRspOuterClass {
       return internalGetCurFightPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
      */
 
     @java.lang.Override
@@ -423,7 +401,7 @@ public final class AvatarUpgradeRspOuterClass {
       return getCurFightPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
      */
     @java.lang.Override
 
@@ -431,7 +409,7 @@ public final class AvatarUpgradeRspOuterClass {
       return internalGetCurFightPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
      */
     @java.lang.Override
 
@@ -444,7 +422,7 @@ public final class AvatarUpgradeRspOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
      */
     @java.lang.Override
 
@@ -459,6 +437,28 @@ public final class AvatarUpgradeRspOuterClass {
       return map.get(key);
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 10;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 10;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int OLD_LEVEL_FIELD_NUMBER = 4;
+    private int oldLevel_;
+    /**
+     * <code>uint32 old_level = 4;</code>
+     * @return The oldLevel.
+     */
+    @java.lang.Override
+    public int getOldLevel() {
+      return oldLevel_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -474,29 +474,29 @@ public final class AvatarUpgradeRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (oldLevel_ != 0) {
-        output.writeUInt32(1, oldLevel_);
+        output.writeUInt32(4, oldLevel_);
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(2, avatarGuid_);
+        output.writeUInt64(8, avatarGuid_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
-      }
-      com.google.protobuf.GeneratedMessageV3
-        .serializeIntegerMapTo(
-          output,
-          internalGetCurFightPropMap(),
-          CurFightPropMapDefaultEntryHolder.defaultEntry,
-          10);
-      if (curLevel_ != 0) {
-        output.writeUInt32(14, curLevel_);
+        output.writeInt32(10, retcode_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetOldFightPropMap(),
           OldFightPropMapDefaultEntryHolder.defaultEntry,
-          15);
+          12);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetCurFightPropMap(),
+          CurFightPropMapDefaultEntryHolder.defaultEntry,
+          13);
+      if (curLevel_ != 0) {
+        output.writeUInt32(14, curLevel_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -508,29 +508,15 @@ public final class AvatarUpgradeRspOuterClass {
       size = 0;
       if (oldLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, oldLevel_);
+          .computeUInt32Size(4, oldLevel_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(2, avatarGuid_);
+          .computeUInt64Size(8, avatarGuid_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
-           : internalGetCurFightPropMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
-        curFightPropMap__ = CurFightPropMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(10, curFightPropMap__);
-      }
-      if (curLevel_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, curLevel_);
+          .computeInt32Size(10, retcode_);
       }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
            : internalGetOldFightPropMap().getMap().entrySet()) {
@@ -540,7 +526,21 @@ public final class AvatarUpgradeRspOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(15, oldFightPropMap__);
+            .computeMessageSize(12, oldFightPropMap__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
+           : internalGetCurFightPropMap().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
+        curFightPropMap__ = CurFightPropMapDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(13, curFightPropMap__);
+      }
+      if (curLevel_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, curLevel_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -563,12 +563,12 @@ public final class AvatarUpgradeRspOuterClass {
           != other.getAvatarGuid()) return false;
       if (getCurLevel()
           != other.getCurLevel()) return false;
+      if (!internalGetCurFightPropMap().equals(
+          other.internalGetCurFightPropMap())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (getOldLevel()
           != other.getOldLevel()) return false;
-      if (!internalGetCurFightPropMap().equals(
-          other.internalGetCurFightPropMap())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -589,14 +589,14 @@ public final class AvatarUpgradeRspOuterClass {
           getAvatarGuid());
       hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getCurLevel();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getOldLevel();
       if (!internalGetCurFightPropMap().getMap().isEmpty()) {
         hash = (37 * hash) + CUR_FIGHT_PROP_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetCurFightPropMap().hashCode();
       }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getOldLevel();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -694,8 +694,8 @@ public final class AvatarUpgradeRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 1651
-     * Name: AGJOJDPCHDG
+     * CmdId: 1695
+     * Obf: JJBMNICCKDE
      * </pre>
      *
      * Protobuf type {@code AvatarUpgradeRsp}
@@ -713,9 +713,9 @@ public final class AvatarUpgradeRspOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 15:
+          case 12:
             return internalGetOldFightPropMap();
-          case 10:
+          case 13:
             return internalGetCurFightPropMap();
           default:
             throw new RuntimeException(
@@ -726,9 +726,9 @@ public final class AvatarUpgradeRspOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 15:
+          case 12:
             return internalGetMutableOldFightPropMap();
-          case 10:
+          case 13:
             return internalGetMutableCurFightPropMap();
           default:
             throw new RuntimeException(
@@ -766,11 +766,11 @@ public final class AvatarUpgradeRspOuterClass {
 
         curLevel_ = 0;
 
+        internalGetMutableCurFightPropMap().clear();
         retcode_ = 0;
 
         oldLevel_ = 0;
 
-        internalGetMutableCurFightPropMap().clear();
         return this;
       }
 
@@ -802,10 +802,10 @@ public final class AvatarUpgradeRspOuterClass {
         result.oldFightPropMap_.makeImmutable();
         result.avatarGuid_ = avatarGuid_;
         result.curLevel_ = curLevel_;
-        result.retcode_ = retcode_;
-        result.oldLevel_ = oldLevel_;
         result.curFightPropMap_ = internalGetCurFightPropMap();
         result.curFightPropMap_.makeImmutable();
+        result.retcode_ = retcode_;
+        result.oldLevel_ = oldLevel_;
         onBuilt();
         return result;
       }
@@ -862,14 +862,14 @@ public final class AvatarUpgradeRspOuterClass {
         if (other.getCurLevel() != 0) {
           setCurLevel(other.getCurLevel());
         }
+        internalGetMutableCurFightPropMap().mergeFrom(
+            other.internalGetCurFightPropMap());
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
         if (other.getOldLevel() != 0) {
           setOldLevel(other.getOldLevel());
         }
-        internalGetMutableCurFightPropMap().mergeFrom(
-            other.internalGetCurFightPropMap());
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -927,7 +927,7 @@ public final class AvatarUpgradeRspOuterClass {
         return internalGetOldFightPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
        */
 
       @java.lang.Override
@@ -945,7 +945,7 @@ public final class AvatarUpgradeRspOuterClass {
         return getOldFightPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
        */
       @java.lang.Override
 
@@ -953,7 +953,7 @@ public final class AvatarUpgradeRspOuterClass {
         return internalGetOldFightPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
        */
       @java.lang.Override
 
@@ -966,7 +966,7 @@ public final class AvatarUpgradeRspOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
        */
       @java.lang.Override
 
@@ -987,7 +987,7 @@ public final class AvatarUpgradeRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
        */
 
       public Builder removeOldFightPropMap(
@@ -1006,7 +1006,7 @@ public final class AvatarUpgradeRspOuterClass {
         return internalGetMutableOldFightPropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
        */
       public Builder putOldFightPropMap(
           int key,
@@ -1018,7 +1018,7 @@ public final class AvatarUpgradeRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 15;</code>
+       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code>
        */
 
       public Builder putAllOldFightPropMap(
@@ -1030,7 +1030,7 @@ public final class AvatarUpgradeRspOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 2;</code>
+       * <code>uint64 avatar_guid = 8;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -1038,7 +1038,7 @@ public final class AvatarUpgradeRspOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 2;</code>
+       * <code>uint64 avatar_guid = 8;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -1049,7 +1049,7 @@ public final class AvatarUpgradeRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 2;</code>
+       * <code>uint64 avatar_guid = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -1090,68 +1090,6 @@ public final class AvatarUpgradeRspOuterClass {
         return this;
       }
 
-      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 int oldLevel_ ;
-      /**
-       * <code>uint32 old_level = 1;</code>
-       * @return The oldLevel.
-       */
-      @java.lang.Override
-      public int getOldLevel() {
-        return oldLevel_;
-      }
-      /**
-       * <code>uint32 old_level = 1;</code>
-       * @param value The oldLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOldLevel(int value) {
-        
-        oldLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 old_level = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOldLevel() {
-        
-        oldLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.MapField<
           java.lang.Integer, java.lang.Float> curFightPropMap_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
@@ -1179,7 +1117,7 @@ public final class AvatarUpgradeRspOuterClass {
         return internalGetCurFightPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
        */
 
       @java.lang.Override
@@ -1197,7 +1135,7 @@ public final class AvatarUpgradeRspOuterClass {
         return getCurFightPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
        */
       @java.lang.Override
 
@@ -1205,7 +1143,7 @@ public final class AvatarUpgradeRspOuterClass {
         return internalGetCurFightPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
        */
       @java.lang.Override
 
@@ -1218,7 +1156,7 @@ public final class AvatarUpgradeRspOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
        */
       @java.lang.Override
 
@@ -1239,7 +1177,7 @@ public final class AvatarUpgradeRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
        */
 
       public Builder removeCurFightPropMap(
@@ -1258,7 +1196,7 @@ public final class AvatarUpgradeRspOuterClass {
         return internalGetMutableCurFightPropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
        */
       public Builder putCurFightPropMap(
           int key,
@@ -1270,7 +1208,7 @@ public final class AvatarUpgradeRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 10;</code>
+       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 13;</code>
        */
 
       public Builder putAllCurFightPropMap(
@@ -1279,6 +1217,68 @@ public final class AvatarUpgradeRspOuterClass {
             .putAll(values);
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 10;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 10;</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 = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int oldLevel_ ;
+      /**
+       * <code>uint32 old_level = 4;</code>
+       * @return The oldLevel.
+       */
+      @java.lang.Override
+      public int getOldLevel() {
+        return oldLevel_;
+      }
+      /**
+       * <code>uint32 old_level = 4;</code>
+       * @param value The oldLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOldLevel(int value) {
+        
+        oldLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 old_level = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOldLevel() {
+        
+        oldLevel_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1357,12 +1357,12 @@ public final class AvatarUpgradeRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026AvatarUpgradeRsp.proto\"\326\002\n\020AvatarUpgra" +
-      "deRsp\022B\n\022old_fight_prop_map\030\017 \003(\0132&.Avat" +
+      "deRsp\022B\n\022old_fight_prop_map\030\014 \003(\0132&.Avat" +
       "arUpgradeRsp.OldFightPropMapEntry\022\023\n\013ava" +
-      "tar_guid\030\002 \001(\004\022\021\n\tcur_level\030\016 \001(\r\022\017\n\007ret" +
-      "code\030\006 \001(\005\022\021\n\told_level\030\001 \001(\r\022B\n\022cur_fig" +
-      "ht_prop_map\030\n \003(\0132&.AvatarUpgradeRsp.Cur" +
-      "FightPropMapEntry\0326\n\024OldFightPropMapEntr" +
+      "tar_guid\030\010 \001(\004\022\021\n\tcur_level\030\016 \001(\r\022B\n\022cur" +
+      "_fight_prop_map\030\r \003(\0132&.AvatarUpgradeRsp" +
+      ".CurFightPropMapEntry\022\017\n\007retcode\030\n \001(\005\022\021" +
+      "\n\told_level\030\004 \001(\r\0326\n\024OldFightPropMapEntr" +
       "y\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\002:\0028\001\0326\n\024Cur" +
       "FightPropMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" +
       "\002 \001(\002:\0028\001B\033\n\031emu.grasscutter.net.protob\006" +
@@ -1377,7 +1377,7 @@ public final class AvatarUpgradeRspOuterClass {
     internal_static_AvatarUpgradeRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarUpgradeRsp_descriptor,
-        new java.lang.String[] { "OldFightPropMap", "AvatarGuid", "CurLevel", "Retcode", "OldLevel", "CurFightPropMap", });
+        new java.lang.String[] { "OldFightPropMap", "AvatarGuid", "CurLevel", "CurFightPropMap", "Retcode", "OldLevel", });
     internal_static_AvatarUpgradeRsp_OldFightPropMapEntry_descriptor =
       internal_static_AvatarUpgradeRsp_descriptor.getNestedTypes().get(0);
     internal_static_AvatarUpgradeRsp_OldFightPropMapEntry_fieldAccessorTable = new