mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-05 02:05:03 +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
+84
-84
@@ -19,22 +19,22 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 best_score = 8;</code>
|
||||
* <code>bool isOpen = 8;</code>
|
||||
* @return The isOpen.
|
||||
*/
|
||||
boolean getIsOpen();
|
||||
|
||||
/**
|
||||
* <code>uint32 bestScore = 7;</code>
|
||||
* @return The bestScore.
|
||||
*/
|
||||
int getBestScore();
|
||||
|
||||
/**
|
||||
* <code>uint32 dungeon_id = 6;</code>
|
||||
* <code>uint32 dungeonId = 6;</code>
|
||||
* @return The dungeonId.
|
||||
*/
|
||||
int getDungeonId();
|
||||
|
||||
/**
|
||||
* <code>bool is_open = 13;</code>
|
||||
* @return The isOpen.
|
||||
*/
|
||||
boolean getIsOpen();
|
||||
}
|
||||
/**
|
||||
* Protobuf type {@code FungusTrainingDungeonDetail}
|
||||
@@ -86,12 +86,12 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
dungeonId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 64: {
|
||||
case 56: {
|
||||
|
||||
bestScore_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 104: {
|
||||
case 64: {
|
||||
|
||||
isOpen_ = input.readBool();
|
||||
break;
|
||||
@@ -128,10 +128,21 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
emu.grasscutter.net.proto.FungusTrainingDungeonDetailOuterClass.FungusTrainingDungeonDetail.class, emu.grasscutter.net.proto.FungusTrainingDungeonDetailOuterClass.FungusTrainingDungeonDetail.Builder.class);
|
||||
}
|
||||
|
||||
public static final int BEST_SCORE_FIELD_NUMBER = 8;
|
||||
public static final int ISOPEN_FIELD_NUMBER = 8;
|
||||
private boolean isOpen_;
|
||||
/**
|
||||
* <code>bool isOpen = 8;</code>
|
||||
* @return The isOpen.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getIsOpen() {
|
||||
return isOpen_;
|
||||
}
|
||||
|
||||
public static final int BESTSCORE_FIELD_NUMBER = 7;
|
||||
private int bestScore_;
|
||||
/**
|
||||
* <code>uint32 best_score = 8;</code>
|
||||
* <code>uint32 bestScore = 7;</code>
|
||||
* @return The bestScore.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -139,10 +150,10 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
return bestScore_;
|
||||
}
|
||||
|
||||
public static final int DUNGEON_ID_FIELD_NUMBER = 6;
|
||||
public static final int DUNGEONID_FIELD_NUMBER = 6;
|
||||
private int dungeonId_;
|
||||
/**
|
||||
* <code>uint32 dungeon_id = 6;</code>
|
||||
* <code>uint32 dungeonId = 6;</code>
|
||||
* @return The dungeonId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -150,17 +161,6 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
return dungeonId_;
|
||||
}
|
||||
|
||||
public static final int IS_OPEN_FIELD_NUMBER = 13;
|
||||
private boolean isOpen_;
|
||||
/**
|
||||
* <code>bool is_open = 13;</code>
|
||||
* @return The isOpen.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getIsOpen() {
|
||||
return isOpen_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -179,10 +179,10 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
output.writeUInt32(6, dungeonId_);
|
||||
}
|
||||
if (bestScore_ != 0) {
|
||||
output.writeUInt32(8, bestScore_);
|
||||
output.writeUInt32(7, bestScore_);
|
||||
}
|
||||
if (isOpen_ != false) {
|
||||
output.writeBool(13, isOpen_);
|
||||
output.writeBool(8, isOpen_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -199,11 +199,11 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
}
|
||||
if (bestScore_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(8, bestScore_);
|
||||
.computeUInt32Size(7, bestScore_);
|
||||
}
|
||||
if (isOpen_ != false) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBoolSize(13, isOpen_);
|
||||
.computeBoolSize(8, isOpen_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -220,12 +220,12 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.FungusTrainingDungeonDetailOuterClass.FungusTrainingDungeonDetail other = (emu.grasscutter.net.proto.FungusTrainingDungeonDetailOuterClass.FungusTrainingDungeonDetail) obj;
|
||||
|
||||
if (getIsOpen()
|
||||
!= other.getIsOpen()) return false;
|
||||
if (getBestScore()
|
||||
!= other.getBestScore()) return false;
|
||||
if (getDungeonId()
|
||||
!= other.getDungeonId()) return false;
|
||||
if (getIsOpen()
|
||||
!= other.getIsOpen()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -237,13 +237,13 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + BEST_SCORE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getBestScore();
|
||||
hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getDungeonId();
|
||||
hash = (37 * hash) + IS_OPEN_FIELD_NUMBER;
|
||||
hash = (37 * hash) + ISOPEN_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
|
||||
getIsOpen());
|
||||
hash = (37 * hash) + BESTSCORE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getBestScore();
|
||||
hash = (37 * hash) + DUNGEONID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getDungeonId();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -377,12 +377,12 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
isOpen_ = false;
|
||||
|
||||
bestScore_ = 0;
|
||||
|
||||
dungeonId_ = 0;
|
||||
|
||||
isOpen_ = false;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -409,9 +409,9 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.FungusTrainingDungeonDetailOuterClass.FungusTrainingDungeonDetail buildPartial() {
|
||||
emu.grasscutter.net.proto.FungusTrainingDungeonDetailOuterClass.FungusTrainingDungeonDetail result = new emu.grasscutter.net.proto.FungusTrainingDungeonDetailOuterClass.FungusTrainingDungeonDetail(this);
|
||||
result.isOpen_ = isOpen_;
|
||||
result.bestScore_ = bestScore_;
|
||||
result.dungeonId_ = dungeonId_;
|
||||
result.isOpen_ = isOpen_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -460,15 +460,15 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.FungusTrainingDungeonDetailOuterClass.FungusTrainingDungeonDetail other) {
|
||||
if (other == emu.grasscutter.net.proto.FungusTrainingDungeonDetailOuterClass.FungusTrainingDungeonDetail.getDefaultInstance()) return this;
|
||||
if (other.getIsOpen() != false) {
|
||||
setIsOpen(other.getIsOpen());
|
||||
}
|
||||
if (other.getBestScore() != 0) {
|
||||
setBestScore(other.getBestScore());
|
||||
}
|
||||
if (other.getDungeonId() != 0) {
|
||||
setDungeonId(other.getDungeonId());
|
||||
}
|
||||
if (other.getIsOpen() != false) {
|
||||
setIsOpen(other.getIsOpen());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -498,9 +498,40 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private boolean isOpen_ ;
|
||||
/**
|
||||
* <code>bool isOpen = 8;</code>
|
||||
* @return The isOpen.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getIsOpen() {
|
||||
return isOpen_;
|
||||
}
|
||||
/**
|
||||
* <code>bool isOpen = 8;</code>
|
||||
* @param value The isOpen to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setIsOpen(boolean value) {
|
||||
|
||||
isOpen_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>bool isOpen = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearIsOpen() {
|
||||
|
||||
isOpen_ = false;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int bestScore_ ;
|
||||
/**
|
||||
* <code>uint32 best_score = 8;</code>
|
||||
* <code>uint32 bestScore = 7;</code>
|
||||
* @return The bestScore.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -508,7 +539,7 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
return bestScore_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 best_score = 8;</code>
|
||||
* <code>uint32 bestScore = 7;</code>
|
||||
* @param value The bestScore to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -519,7 +550,7 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 best_score = 8;</code>
|
||||
* <code>uint32 bestScore = 7;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearBestScore() {
|
||||
@@ -531,7 +562,7 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
|
||||
private int dungeonId_ ;
|
||||
/**
|
||||
* <code>uint32 dungeon_id = 6;</code>
|
||||
* <code>uint32 dungeonId = 6;</code>
|
||||
* @return The dungeonId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -539,7 +570,7 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
return dungeonId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 dungeon_id = 6;</code>
|
||||
* <code>uint32 dungeonId = 6;</code>
|
||||
* @param value The dungeonId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -550,7 +581,7 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 dungeon_id = 6;</code>
|
||||
* <code>uint32 dungeonId = 6;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearDungeonId() {
|
||||
@@ -559,37 +590,6 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private boolean isOpen_ ;
|
||||
/**
|
||||
* <code>bool is_open = 13;</code>
|
||||
* @return The isOpen.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getIsOpen() {
|
||||
return isOpen_;
|
||||
}
|
||||
/**
|
||||
* <code>bool is_open = 13;</code>
|
||||
* @param value The isOpen to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setIsOpen(boolean value) {
|
||||
|
||||
isOpen_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>bool is_open = 13;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearIsOpen() {
|
||||
|
||||
isOpen_ = false;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -657,10 +657,10 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n!FungusTrainingDungeonDetail.proto\"V\n\033F" +
|
||||
"ungusTrainingDungeonDetail\022\022\n\nbest_score" +
|
||||
"\030\010 \001(\r\022\022\n\ndungeon_id\030\006 \001(\r\022\017\n\007is_open\030\r " +
|
||||
"\001(\010B\033\n\031emu.grasscutter.net.protob\006proto3"
|
||||
"\n!FungusTrainingDungeonDetail.proto\"S\n\033F" +
|
||||
"ungusTrainingDungeonDetail\022\016\n\006isOpen\030\010 \001" +
|
||||
"(\010\022\021\n\tbestScore\030\007 \001(\r\022\021\n\tdungeonId\030\006 \001(\r" +
|
||||
"B\033\n\031emu.grasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
@@ -671,7 +671,7 @@ public final class FungusTrainingDungeonDetailOuterClass {
|
||||
internal_static_FungusTrainingDungeonDetail_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_FungusTrainingDungeonDetail_descriptor,
|
||||
new java.lang.String[] { "BestScore", "DungeonId", "IsOpen", });
|
||||
new java.lang.String[] { "IsOpen", "BestScore", "DungeonId", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user