mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-24 00:29:53 +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
+96
-96
@@ -19,22 +19,22 @@ public final class BartenderLevelInfoOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 id = 12;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
int getId();
|
||||
|
||||
/**
|
||||
* <code>bool is_finish = 3;</code>
|
||||
* <code>bool isFinish = 13;</code>
|
||||
* @return The isFinish.
|
||||
*/
|
||||
boolean getIsFinish();
|
||||
|
||||
/**
|
||||
* <code>uint32 max_score = 2;</code>
|
||||
* <code>uint32 maxScore = 12;</code>
|
||||
* @return The maxScore.
|
||||
*/
|
||||
int getMaxScore();
|
||||
|
||||
/**
|
||||
* <code>uint32 id = 10;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
int getId();
|
||||
}
|
||||
/**
|
||||
* Protobuf type {@code BartenderLevelInfo}
|
||||
@@ -81,19 +81,19 @@ public final class BartenderLevelInfoOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 16: {
|
||||
case 80: {
|
||||
|
||||
maxScore_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 24: {
|
||||
|
||||
isFinish_ = input.readBool();
|
||||
id_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 96: {
|
||||
|
||||
id_ = input.readUInt32();
|
||||
maxScore_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 104: {
|
||||
|
||||
isFinish_ = input.readBool();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
@@ -128,21 +128,10 @@ public final class BartenderLevelInfoOuterClass {
|
||||
emu.grasscutter.net.proto.BartenderLevelInfoOuterClass.BartenderLevelInfo.class, emu.grasscutter.net.proto.BartenderLevelInfoOuterClass.BartenderLevelInfo.Builder.class);
|
||||
}
|
||||
|
||||
public static final int ID_FIELD_NUMBER = 12;
|
||||
private int id_;
|
||||
/**
|
||||
* <code>uint32 id = 12;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getId() {
|
||||
return id_;
|
||||
}
|
||||
|
||||
public static final int IS_FINISH_FIELD_NUMBER = 3;
|
||||
public static final int ISFINISH_FIELD_NUMBER = 13;
|
||||
private boolean isFinish_;
|
||||
/**
|
||||
* <code>bool is_finish = 3;</code>
|
||||
* <code>bool isFinish = 13;</code>
|
||||
* @return The isFinish.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -150,10 +139,10 @@ public final class BartenderLevelInfoOuterClass {
|
||||
return isFinish_;
|
||||
}
|
||||
|
||||
public static final int MAX_SCORE_FIELD_NUMBER = 2;
|
||||
public static final int MAXSCORE_FIELD_NUMBER = 12;
|
||||
private int maxScore_;
|
||||
/**
|
||||
* <code>uint32 max_score = 2;</code>
|
||||
* <code>uint32 maxScore = 12;</code>
|
||||
* @return The maxScore.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -161,6 +150,17 @@ public final class BartenderLevelInfoOuterClass {
|
||||
return maxScore_;
|
||||
}
|
||||
|
||||
public static final int ID_FIELD_NUMBER = 10;
|
||||
private int id_;
|
||||
/**
|
||||
* <code>uint32 id = 10;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getId() {
|
||||
return id_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -175,14 +175,14 @@ public final class BartenderLevelInfoOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (id_ != 0) {
|
||||
output.writeUInt32(10, id_);
|
||||
}
|
||||
if (maxScore_ != 0) {
|
||||
output.writeUInt32(2, maxScore_);
|
||||
output.writeUInt32(12, maxScore_);
|
||||
}
|
||||
if (isFinish_ != false) {
|
||||
output.writeBool(3, isFinish_);
|
||||
}
|
||||
if (id_ != 0) {
|
||||
output.writeUInt32(12, id_);
|
||||
output.writeBool(13, isFinish_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -193,17 +193,17 @@ public final class BartenderLevelInfoOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (id_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(10, id_);
|
||||
}
|
||||
if (maxScore_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(2, maxScore_);
|
||||
.computeUInt32Size(12, maxScore_);
|
||||
}
|
||||
if (isFinish_ != false) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBoolSize(3, isFinish_);
|
||||
}
|
||||
if (id_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(12, id_);
|
||||
.computeBoolSize(13, isFinish_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -220,12 +220,12 @@ public final class BartenderLevelInfoOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.BartenderLevelInfoOuterClass.BartenderLevelInfo other = (emu.grasscutter.net.proto.BartenderLevelInfoOuterClass.BartenderLevelInfo) obj;
|
||||
|
||||
if (getId()
|
||||
!= other.getId()) return false;
|
||||
if (getIsFinish()
|
||||
!= other.getIsFinish()) return false;
|
||||
if (getMaxScore()
|
||||
!= other.getMaxScore()) return false;
|
||||
if (getId()
|
||||
!= other.getId()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -237,13 +237,13 @@ public final class BartenderLevelInfoOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getId();
|
||||
hash = (37 * hash) + IS_FINISH_FIELD_NUMBER;
|
||||
hash = (37 * hash) + ISFINISH_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
|
||||
getIsFinish());
|
||||
hash = (37 * hash) + MAX_SCORE_FIELD_NUMBER;
|
||||
hash = (37 * hash) + MAXSCORE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getMaxScore();
|
||||
hash = (37 * hash) + ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getId();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -377,12 +377,12 @@ public final class BartenderLevelInfoOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
id_ = 0;
|
||||
|
||||
isFinish_ = false;
|
||||
|
||||
maxScore_ = 0;
|
||||
|
||||
id_ = 0;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -409,9 +409,9 @@ public final class BartenderLevelInfoOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.BartenderLevelInfoOuterClass.BartenderLevelInfo buildPartial() {
|
||||
emu.grasscutter.net.proto.BartenderLevelInfoOuterClass.BartenderLevelInfo result = new emu.grasscutter.net.proto.BartenderLevelInfoOuterClass.BartenderLevelInfo(this);
|
||||
result.id_ = id_;
|
||||
result.isFinish_ = isFinish_;
|
||||
result.maxScore_ = maxScore_;
|
||||
result.id_ = id_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -460,15 +460,15 @@ public final class BartenderLevelInfoOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.BartenderLevelInfoOuterClass.BartenderLevelInfo other) {
|
||||
if (other == emu.grasscutter.net.proto.BartenderLevelInfoOuterClass.BartenderLevelInfo.getDefaultInstance()) return this;
|
||||
if (other.getId() != 0) {
|
||||
setId(other.getId());
|
||||
}
|
||||
if (other.getIsFinish() != false) {
|
||||
setIsFinish(other.getIsFinish());
|
||||
}
|
||||
if (other.getMaxScore() != 0) {
|
||||
setMaxScore(other.getMaxScore());
|
||||
}
|
||||
if (other.getId() != 0) {
|
||||
setId(other.getId());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -498,40 +498,9 @@ public final class BartenderLevelInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int id_ ;
|
||||
/**
|
||||
* <code>uint32 id = 12;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getId() {
|
||||
return id_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 id = 12;</code>
|
||||
* @param value The id to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setId(int value) {
|
||||
|
||||
id_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 id = 12;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearId() {
|
||||
|
||||
id_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private boolean isFinish_ ;
|
||||
/**
|
||||
* <code>bool is_finish = 3;</code>
|
||||
* <code>bool isFinish = 13;</code>
|
||||
* @return The isFinish.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -539,7 +508,7 @@ public final class BartenderLevelInfoOuterClass {
|
||||
return isFinish_;
|
||||
}
|
||||
/**
|
||||
* <code>bool is_finish = 3;</code>
|
||||
* <code>bool isFinish = 13;</code>
|
||||
* @param value The isFinish to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -550,7 +519,7 @@ public final class BartenderLevelInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>bool is_finish = 3;</code>
|
||||
* <code>bool isFinish = 13;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearIsFinish() {
|
||||
@@ -562,7 +531,7 @@ public final class BartenderLevelInfoOuterClass {
|
||||
|
||||
private int maxScore_ ;
|
||||
/**
|
||||
* <code>uint32 max_score = 2;</code>
|
||||
* <code>uint32 maxScore = 12;</code>
|
||||
* @return The maxScore.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -570,7 +539,7 @@ public final class BartenderLevelInfoOuterClass {
|
||||
return maxScore_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 max_score = 2;</code>
|
||||
* <code>uint32 maxScore = 12;</code>
|
||||
* @param value The maxScore to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -581,7 +550,7 @@ public final class BartenderLevelInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 max_score = 2;</code>
|
||||
* <code>uint32 maxScore = 12;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearMaxScore() {
|
||||
@@ -590,6 +559,37 @@ public final class BartenderLevelInfoOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int id_ ;
|
||||
/**
|
||||
* <code>uint32 id = 10;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getId() {
|
||||
return id_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 id = 10;</code>
|
||||
* @param value The id to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setId(int value) {
|
||||
|
||||
id_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 id = 10;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearId() {
|
||||
|
||||
id_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -657,10 +657,10 @@ public final class BartenderLevelInfoOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\030BartenderLevelInfo.proto\"F\n\022BartenderL" +
|
||||
"evelInfo\022\n\n\002id\030\014 \001(\r\022\021\n\tis_finish\030\003 \001(\010\022" +
|
||||
"\021\n\tmax_score\030\002 \001(\rB\033\n\031emu.grasscutter.ne" +
|
||||
"t.protob\006proto3"
|
||||
"\n\030BartenderLevelInfo.proto\"D\n\022BartenderL" +
|
||||
"evelInfo\022\020\n\010isFinish\030\r \001(\010\022\020\n\010maxScore\030\014" +
|
||||
" \001(\r\022\n\n\002id\030\n \001(\rB\033\n\031emu.grasscutter.net." +
|
||||
"protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
@@ -671,7 +671,7 @@ public final class BartenderLevelInfoOuterClass {
|
||||
internal_static_BartenderLevelInfo_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_BartenderLevelInfo_descriptor,
|
||||
new java.lang.String[] { "Id", "IsFinish", "MaxScore", });
|
||||
new java.lang.String[] { "IsFinish", "MaxScore", "Id", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user