mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-05 10:33:34 +08:00
Update gc to 3.3 (#1981)
* replace the deprecated api * update proto * delete music game * fixed codes * fix costume switch * fix mail bug * Bump version number. * Re-add max boss chest number Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
Unverified
parent
8b83dbf58c
commit
92fbaa8670
+166
-160
@@ -19,35 +19,38 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 talent_type = 11;</code>
|
||||
* @return The talentType.
|
||||
*/
|
||||
int getTalentType();
|
||||
|
||||
/**
|
||||
* <code>uint32 talent_index = 8;</code>
|
||||
* @return The talentIndex.
|
||||
*/
|
||||
int getTalentIndex();
|
||||
|
||||
/**
|
||||
* <code>uint64 avatar_guid = 15;</code>
|
||||
* <code>uint64 avatar_guid = 13;</code>
|
||||
* @return The avatarGuid.
|
||||
*/
|
||||
long getAvatarGuid();
|
||||
|
||||
/**
|
||||
* <code>uint32 extra_level = 3;</code>
|
||||
* <code>uint32 extra_level = 4;</code>
|
||||
* @return The extraLevel.
|
||||
*/
|
||||
int getExtraLevel();
|
||||
|
||||
/**
|
||||
* <code>uint32 talent_type = 8;</code>
|
||||
* @return The talentType.
|
||||
*/
|
||||
int getTalentType();
|
||||
|
||||
/**
|
||||
* <code>uint32 talent_index = 2;</code>
|
||||
* @return The talentIndex.
|
||||
*/
|
||||
int getTalentIndex();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 1081
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 1025;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code ProudSkillExtraLevelNotify}
|
||||
@@ -94,22 +97,22 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 24: {
|
||||
case 16: {
|
||||
|
||||
talentIndex_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 32: {
|
||||
|
||||
extraLevel_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 64: {
|
||||
|
||||
talentIndex_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 88: {
|
||||
|
||||
talentType_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 120: {
|
||||
case 104: {
|
||||
|
||||
avatarGuid_ = input.readUInt64();
|
||||
break;
|
||||
@@ -146,32 +149,10 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify.class, emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify.Builder.class);
|
||||
}
|
||||
|
||||
public static final int TALENT_TYPE_FIELD_NUMBER = 11;
|
||||
private int talentType_;
|
||||
/**
|
||||
* <code>uint32 talent_type = 11;</code>
|
||||
* @return The talentType.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getTalentType() {
|
||||
return talentType_;
|
||||
}
|
||||
|
||||
public static final int TALENT_INDEX_FIELD_NUMBER = 8;
|
||||
private int talentIndex_;
|
||||
/**
|
||||
* <code>uint32 talent_index = 8;</code>
|
||||
* @return The talentIndex.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getTalentIndex() {
|
||||
return talentIndex_;
|
||||
}
|
||||
|
||||
public static final int AVATAR_GUID_FIELD_NUMBER = 15;
|
||||
public static final int AVATAR_GUID_FIELD_NUMBER = 13;
|
||||
private long avatarGuid_;
|
||||
/**
|
||||
* <code>uint64 avatar_guid = 15;</code>
|
||||
* <code>uint64 avatar_guid = 13;</code>
|
||||
* @return The avatarGuid.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -179,10 +160,10 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
return avatarGuid_;
|
||||
}
|
||||
|
||||
public static final int EXTRA_LEVEL_FIELD_NUMBER = 3;
|
||||
public static final int EXTRA_LEVEL_FIELD_NUMBER = 4;
|
||||
private int extraLevel_;
|
||||
/**
|
||||
* <code>uint32 extra_level = 3;</code>
|
||||
* <code>uint32 extra_level = 4;</code>
|
||||
* @return The extraLevel.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -190,6 +171,28 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
return extraLevel_;
|
||||
}
|
||||
|
||||
public static final int TALENT_TYPE_FIELD_NUMBER = 8;
|
||||
private int talentType_;
|
||||
/**
|
||||
* <code>uint32 talent_type = 8;</code>
|
||||
* @return The talentType.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getTalentType() {
|
||||
return talentType_;
|
||||
}
|
||||
|
||||
public static final int TALENT_INDEX_FIELD_NUMBER = 2;
|
||||
private int talentIndex_;
|
||||
/**
|
||||
* <code>uint32 talent_index = 2;</code>
|
||||
* @return The talentIndex.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getTalentIndex() {
|
||||
return talentIndex_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -204,17 +207,17 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (extraLevel_ != 0) {
|
||||
output.writeUInt32(3, extraLevel_);
|
||||
}
|
||||
if (talentIndex_ != 0) {
|
||||
output.writeUInt32(8, talentIndex_);
|
||||
output.writeUInt32(2, talentIndex_);
|
||||
}
|
||||
if (extraLevel_ != 0) {
|
||||
output.writeUInt32(4, extraLevel_);
|
||||
}
|
||||
if (talentType_ != 0) {
|
||||
output.writeUInt32(11, talentType_);
|
||||
output.writeUInt32(8, talentType_);
|
||||
}
|
||||
if (avatarGuid_ != 0L) {
|
||||
output.writeUInt64(15, avatarGuid_);
|
||||
output.writeUInt64(13, avatarGuid_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -225,21 +228,21 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (extraLevel_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(3, extraLevel_);
|
||||
}
|
||||
if (talentIndex_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(8, talentIndex_);
|
||||
.computeUInt32Size(2, talentIndex_);
|
||||
}
|
||||
if (extraLevel_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(4, extraLevel_);
|
||||
}
|
||||
if (talentType_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(11, talentType_);
|
||||
.computeUInt32Size(8, talentType_);
|
||||
}
|
||||
if (avatarGuid_ != 0L) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt64Size(15, avatarGuid_);
|
||||
.computeUInt64Size(13, avatarGuid_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -256,14 +259,14 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify other = (emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify) obj;
|
||||
|
||||
if (getTalentType()
|
||||
!= other.getTalentType()) return false;
|
||||
if (getTalentIndex()
|
||||
!= other.getTalentIndex()) return false;
|
||||
if (getAvatarGuid()
|
||||
!= other.getAvatarGuid()) return false;
|
||||
if (getExtraLevel()
|
||||
!= other.getExtraLevel()) return false;
|
||||
if (getTalentType()
|
||||
!= other.getTalentType()) return false;
|
||||
if (getTalentIndex()
|
||||
!= other.getTalentIndex()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -275,15 +278,15 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + TALENT_TYPE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getTalentType();
|
||||
hash = (37 * hash) + TALENT_INDEX_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getTalentIndex();
|
||||
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
|
||||
getAvatarGuid());
|
||||
hash = (37 * hash) + EXTRA_LEVEL_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getExtraLevel();
|
||||
hash = (37 * hash) + TALENT_TYPE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getTalentType();
|
||||
hash = (37 * hash) + TALENT_INDEX_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getTalentIndex();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -381,10 +384,13 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 1081
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 1025;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code ProudSkillExtraLevelNotify}
|
||||
@@ -424,14 +430,14 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
talentType_ = 0;
|
||||
|
||||
talentIndex_ = 0;
|
||||
|
||||
avatarGuid_ = 0L;
|
||||
|
||||
extraLevel_ = 0;
|
||||
|
||||
talentType_ = 0;
|
||||
|
||||
talentIndex_ = 0;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -458,10 +464,10 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify buildPartial() {
|
||||
emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify result = new emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify(this);
|
||||
result.talentType_ = talentType_;
|
||||
result.talentIndex_ = talentIndex_;
|
||||
result.avatarGuid_ = avatarGuid_;
|
||||
result.extraLevel_ = extraLevel_;
|
||||
result.talentType_ = talentType_;
|
||||
result.talentIndex_ = talentIndex_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -510,18 +516,18 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify other) {
|
||||
if (other == emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify.getDefaultInstance()) return this;
|
||||
if (other.getTalentType() != 0) {
|
||||
setTalentType(other.getTalentType());
|
||||
}
|
||||
if (other.getTalentIndex() != 0) {
|
||||
setTalentIndex(other.getTalentIndex());
|
||||
}
|
||||
if (other.getAvatarGuid() != 0L) {
|
||||
setAvatarGuid(other.getAvatarGuid());
|
||||
}
|
||||
if (other.getExtraLevel() != 0) {
|
||||
setExtraLevel(other.getExtraLevel());
|
||||
}
|
||||
if (other.getTalentType() != 0) {
|
||||
setTalentType(other.getTalentType());
|
||||
}
|
||||
if (other.getTalentIndex() != 0) {
|
||||
setTalentIndex(other.getTalentIndex());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -551,71 +557,9 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int talentType_ ;
|
||||
/**
|
||||
* <code>uint32 talent_type = 11;</code>
|
||||
* @return The talentType.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getTalentType() {
|
||||
return talentType_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 talent_type = 11;</code>
|
||||
* @param value The talentType to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setTalentType(int value) {
|
||||
|
||||
talentType_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 talent_type = 11;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearTalentType() {
|
||||
|
||||
talentType_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int talentIndex_ ;
|
||||
/**
|
||||
* <code>uint32 talent_index = 8;</code>
|
||||
* @return The talentIndex.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getTalentIndex() {
|
||||
return talentIndex_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 talent_index = 8;</code>
|
||||
* @param value The talentIndex to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setTalentIndex(int value) {
|
||||
|
||||
talentIndex_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 talent_index = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearTalentIndex() {
|
||||
|
||||
talentIndex_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private long avatarGuid_ ;
|
||||
/**
|
||||
* <code>uint64 avatar_guid = 15;</code>
|
||||
* <code>uint64 avatar_guid = 13;</code>
|
||||
* @return The avatarGuid.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -623,7 +567,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
return avatarGuid_;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 avatar_guid = 15;</code>
|
||||
* <code>uint64 avatar_guid = 13;</code>
|
||||
* @param value The avatarGuid to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -634,7 +578,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 avatar_guid = 15;</code>
|
||||
* <code>uint64 avatar_guid = 13;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearAvatarGuid() {
|
||||
@@ -646,7 +590,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
|
||||
private int extraLevel_ ;
|
||||
/**
|
||||
* <code>uint32 extra_level = 3;</code>
|
||||
* <code>uint32 extra_level = 4;</code>
|
||||
* @return The extraLevel.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -654,7 +598,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
return extraLevel_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 extra_level = 3;</code>
|
||||
* <code>uint32 extra_level = 4;</code>
|
||||
* @param value The extraLevel to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -665,7 +609,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 extra_level = 3;</code>
|
||||
* <code>uint32 extra_level = 4;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearExtraLevel() {
|
||||
@@ -674,6 +618,68 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int talentType_ ;
|
||||
/**
|
||||
* <code>uint32 talent_type = 8;</code>
|
||||
* @return The talentType.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getTalentType() {
|
||||
return talentType_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 talent_type = 8;</code>
|
||||
* @param value The talentType to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setTalentType(int value) {
|
||||
|
||||
talentType_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 talent_type = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearTalentType() {
|
||||
|
||||
talentType_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int talentIndex_ ;
|
||||
/**
|
||||
* <code>uint32 talent_index = 2;</code>
|
||||
* @return The talentIndex.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getTalentIndex() {
|
||||
return talentIndex_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 talent_index = 2;</code>
|
||||
* @param value The talentIndex to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setTalentIndex(int value) {
|
||||
|
||||
talentIndex_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 talent_index = 2;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearTalentIndex() {
|
||||
|
||||
talentIndex_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -742,9 +748,9 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n ProudSkillExtraLevelNotify.proto\"q\n\032Pr" +
|
||||
"oudSkillExtraLevelNotify\022\023\n\013talent_type\030" +
|
||||
"\013 \001(\r\022\024\n\014talent_index\030\010 \001(\r\022\023\n\013avatar_gu" +
|
||||
"id\030\017 \001(\004\022\023\n\013extra_level\030\003 \001(\rB\033\n\031emu.gra" +
|
||||
"oudSkillExtraLevelNotify\022\023\n\013avatar_guid\030" +
|
||||
"\r \001(\004\022\023\n\013extra_level\030\004 \001(\r\022\023\n\013talent_typ" +
|
||||
"e\030\010 \001(\r\022\024\n\014talent_index\030\002 \001(\rB\033\n\031emu.gra" +
|
||||
"sscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -756,7 +762,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
|
||||
internal_static_ProudSkillExtraLevelNotify_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_ProudSkillExtraLevelNotify_descriptor,
|
||||
new java.lang.String[] { "TalentType", "TalentIndex", "AvatarGuid", "ExtraLevel", });
|
||||
new java.lang.String[] { "AvatarGuid", "ExtraLevel", "TalentType", "TalentIndex", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user