mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-23 12:37:36 +08:00
update gc 3.4 (#2041)
* update 3.4 * update3.4 * update 3.4 * update 3.4 * Add files via upload * Delete SetPropCommand.java * update 3.4 area id * update version * exchange cmdid * exchange cmdid * exchange cmdid * my fault * update AiSyncInfo
This commit is contained in:
committed by
GitHub
Unverified
parent
39b4aa1387
commit
71a1e31d37
+83
-83
@@ -19,16 +19,16 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint64 avatar_id = 10;</code>
|
||||
* @return The avatarId.
|
||||
*/
|
||||
long getAvatarId();
|
||||
|
||||
/**
|
||||
* <code>bool is_trial = 12;</code>
|
||||
* <code>bool isTrial = 2;</code>
|
||||
* @return The isTrial.
|
||||
*/
|
||||
boolean getIsTrial();
|
||||
|
||||
/**
|
||||
* <code>uint64 avatarId = 12;</code>
|
||||
* @return The avatarId.
|
||||
*/
|
||||
long getAvatarId();
|
||||
}
|
||||
/**
|
||||
* Protobuf type {@code InstableSprayAvatarInfo}
|
||||
@@ -75,14 +75,14 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 80: {
|
||||
case 16: {
|
||||
|
||||
avatarId_ = input.readUInt64();
|
||||
isTrial_ = input.readBool();
|
||||
break;
|
||||
}
|
||||
case 96: {
|
||||
|
||||
isTrial_ = input.readBool();
|
||||
avatarId_ = input.readUInt64();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
@@ -117,21 +117,10 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
emu.grasscutter.net.proto.InstableSprayAvatarInfoOuterClass.InstableSprayAvatarInfo.class, emu.grasscutter.net.proto.InstableSprayAvatarInfoOuterClass.InstableSprayAvatarInfo.Builder.class);
|
||||
}
|
||||
|
||||
public static final int AVATAR_ID_FIELD_NUMBER = 10;
|
||||
private long avatarId_;
|
||||
/**
|
||||
* <code>uint64 avatar_id = 10;</code>
|
||||
* @return The avatarId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getAvatarId() {
|
||||
return avatarId_;
|
||||
}
|
||||
|
||||
public static final int IS_TRIAL_FIELD_NUMBER = 12;
|
||||
public static final int ISTRIAL_FIELD_NUMBER = 2;
|
||||
private boolean isTrial_;
|
||||
/**
|
||||
* <code>bool is_trial = 12;</code>
|
||||
* <code>bool isTrial = 2;</code>
|
||||
* @return The isTrial.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -139,6 +128,17 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
return isTrial_;
|
||||
}
|
||||
|
||||
public static final int AVATARID_FIELD_NUMBER = 12;
|
||||
private long avatarId_;
|
||||
/**
|
||||
* <code>uint64 avatarId = 12;</code>
|
||||
* @return The avatarId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getAvatarId() {
|
||||
return avatarId_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -153,11 +153,11 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (avatarId_ != 0L) {
|
||||
output.writeUInt64(10, avatarId_);
|
||||
}
|
||||
if (isTrial_ != false) {
|
||||
output.writeBool(12, isTrial_);
|
||||
output.writeBool(2, isTrial_);
|
||||
}
|
||||
if (avatarId_ != 0L) {
|
||||
output.writeUInt64(12, avatarId_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -168,13 +168,13 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (avatarId_ != 0L) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt64Size(10, avatarId_);
|
||||
}
|
||||
if (isTrial_ != false) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBoolSize(12, isTrial_);
|
||||
.computeBoolSize(2, isTrial_);
|
||||
}
|
||||
if (avatarId_ != 0L) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt64Size(12, avatarId_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -191,10 +191,10 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.InstableSprayAvatarInfoOuterClass.InstableSprayAvatarInfo other = (emu.grasscutter.net.proto.InstableSprayAvatarInfoOuterClass.InstableSprayAvatarInfo) obj;
|
||||
|
||||
if (getAvatarId()
|
||||
!= other.getAvatarId()) return false;
|
||||
if (getIsTrial()
|
||||
!= other.getIsTrial()) return false;
|
||||
if (getAvatarId()
|
||||
!= other.getAvatarId()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -206,12 +206,12 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
|
||||
getAvatarId());
|
||||
hash = (37 * hash) + IS_TRIAL_FIELD_NUMBER;
|
||||
hash = (37 * hash) + ISTRIAL_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
|
||||
getIsTrial());
|
||||
hash = (37 * hash) + AVATARID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
|
||||
getAvatarId());
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -345,10 +345,10 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
avatarId_ = 0L;
|
||||
|
||||
isTrial_ = false;
|
||||
|
||||
avatarId_ = 0L;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -375,8 +375,8 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.InstableSprayAvatarInfoOuterClass.InstableSprayAvatarInfo buildPartial() {
|
||||
emu.grasscutter.net.proto.InstableSprayAvatarInfoOuterClass.InstableSprayAvatarInfo result = new emu.grasscutter.net.proto.InstableSprayAvatarInfoOuterClass.InstableSprayAvatarInfo(this);
|
||||
result.avatarId_ = avatarId_;
|
||||
result.isTrial_ = isTrial_;
|
||||
result.avatarId_ = avatarId_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -425,12 +425,12 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.InstableSprayAvatarInfoOuterClass.InstableSprayAvatarInfo other) {
|
||||
if (other == emu.grasscutter.net.proto.InstableSprayAvatarInfoOuterClass.InstableSprayAvatarInfo.getDefaultInstance()) return this;
|
||||
if (other.getAvatarId() != 0L) {
|
||||
setAvatarId(other.getAvatarId());
|
||||
}
|
||||
if (other.getIsTrial() != false) {
|
||||
setIsTrial(other.getIsTrial());
|
||||
}
|
||||
if (other.getAvatarId() != 0L) {
|
||||
setAvatarId(other.getAvatarId());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -460,40 +460,9 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private long avatarId_ ;
|
||||
/**
|
||||
* <code>uint64 avatar_id = 10;</code>
|
||||
* @return The avatarId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getAvatarId() {
|
||||
return avatarId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 avatar_id = 10;</code>
|
||||
* @param value The avatarId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setAvatarId(long value) {
|
||||
|
||||
avatarId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 avatar_id = 10;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearAvatarId() {
|
||||
|
||||
avatarId_ = 0L;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private boolean isTrial_ ;
|
||||
/**
|
||||
* <code>bool is_trial = 12;</code>
|
||||
* <code>bool isTrial = 2;</code>
|
||||
* @return The isTrial.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -501,7 +470,7 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
return isTrial_;
|
||||
}
|
||||
/**
|
||||
* <code>bool is_trial = 12;</code>
|
||||
* <code>bool isTrial = 2;</code>
|
||||
* @param value The isTrial to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -512,7 +481,7 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>bool is_trial = 12;</code>
|
||||
* <code>bool isTrial = 2;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearIsTrial() {
|
||||
@@ -521,6 +490,37 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private long avatarId_ ;
|
||||
/**
|
||||
* <code>uint64 avatarId = 12;</code>
|
||||
* @return The avatarId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getAvatarId() {
|
||||
return avatarId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 avatarId = 12;</code>
|
||||
* @param value The avatarId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setAvatarId(long value) {
|
||||
|
||||
avatarId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 avatarId = 12;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearAvatarId() {
|
||||
|
||||
avatarId_ = 0L;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -588,10 +588,10 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\035InstableSprayAvatarInfo.proto\">\n\027Insta" +
|
||||
"bleSprayAvatarInfo\022\021\n\tavatar_id\030\n \001(\004\022\020\n" +
|
||||
"\010is_trial\030\014 \001(\010B\033\n\031emu.grasscutter.net.p" +
|
||||
"rotob\006proto3"
|
||||
"\n\035InstableSprayAvatarInfo.proto\"<\n\027Insta" +
|
||||
"bleSprayAvatarInfo\022\017\n\007isTrial\030\002 \001(\010\022\020\n\010a" +
|
||||
"vatarId\030\014 \001(\004B\033\n\031emu.grasscutter.net.pro" +
|
||||
"tob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
@@ -602,7 +602,7 @@ public final class InstableSprayAvatarInfoOuterClass {
|
||||
internal_static_InstableSprayAvatarInfo_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_InstableSprayAvatarInfo_descriptor,
|
||||
new java.lang.String[] { "AvatarId", "IsTrial", });
|
||||
new java.lang.String[] { "IsTrial", "AvatarId", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user