mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-05 04:13:34 +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:
yeyeye
committed by
GitHub
Unverified
GitHub
parent
39b4aa1387
commit
71a1e31d37
+102
-102
@@ -19,30 +19,30 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>repeated uint32 factor_list = 1;</code>
|
||||
* <code>uint32 entranceId = 1;</code>
|
||||
* @return The entranceId.
|
||||
*/
|
||||
int getEntranceId();
|
||||
|
||||
/**
|
||||
* <code>repeated uint32 factorList = 3;</code>
|
||||
* @return A list containing the factorList.
|
||||
*/
|
||||
java.util.List<java.lang.Integer> getFactorListList();
|
||||
/**
|
||||
* <code>repeated uint32 factor_list = 1;</code>
|
||||
* <code>repeated uint32 factorList = 3;</code>
|
||||
* @return The count of factorList.
|
||||
*/
|
||||
int getFactorListCount();
|
||||
/**
|
||||
* <code>repeated uint32 factor_list = 1;</code>
|
||||
* <code>repeated uint32 factorList = 3;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The factorList at the given index.
|
||||
*/
|
||||
int getFactorList(int index);
|
||||
|
||||
/**
|
||||
* <code>uint32 entrance_id = 8;</code>
|
||||
* @return The entranceId.
|
||||
*/
|
||||
int getEntranceId();
|
||||
|
||||
/**
|
||||
* <code>uint32 template_id = 15;</code>
|
||||
* <code>uint32 templateId = 6;</code>
|
||||
* @return The templateId.
|
||||
*/
|
||||
int getTemplateId();
|
||||
@@ -95,6 +95,11 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
done = true;
|
||||
break;
|
||||
case 8: {
|
||||
|
||||
entranceId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 24: {
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
|
||||
factorList_ = newIntList();
|
||||
mutable_bitField0_ |= 0x00000001;
|
||||
@@ -102,7 +107,7 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
factorList_.addInt(input.readUInt32());
|
||||
break;
|
||||
}
|
||||
case 10: {
|
||||
case 26: {
|
||||
int length = input.readRawVarint32();
|
||||
int limit = input.pushLimit(length);
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
|
||||
@@ -115,12 +120,7 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
input.popLimit(limit);
|
||||
break;
|
||||
}
|
||||
case 64: {
|
||||
|
||||
entranceId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 120: {
|
||||
case 48: {
|
||||
|
||||
templateId_ = input.readUInt32();
|
||||
break;
|
||||
@@ -160,10 +160,21 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.class, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder.class);
|
||||
}
|
||||
|
||||
public static final int FACTOR_LIST_FIELD_NUMBER = 1;
|
||||
public static final int ENTRANCEID_FIELD_NUMBER = 1;
|
||||
private int entranceId_;
|
||||
/**
|
||||
* <code>uint32 entranceId = 1;</code>
|
||||
* @return The entranceId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getEntranceId() {
|
||||
return entranceId_;
|
||||
}
|
||||
|
||||
public static final int FACTORLIST_FIELD_NUMBER = 3;
|
||||
private com.google.protobuf.Internal.IntList factorList_;
|
||||
/**
|
||||
* <code>repeated uint32 factor_list = 1;</code>
|
||||
* <code>repeated uint32 factorList = 3;</code>
|
||||
* @return A list containing the factorList.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -172,14 +183,14 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
return factorList_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 factor_list = 1;</code>
|
||||
* <code>repeated uint32 factorList = 3;</code>
|
||||
* @return The count of factorList.
|
||||
*/
|
||||
public int getFactorListCount() {
|
||||
return factorList_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 factor_list = 1;</code>
|
||||
* <code>repeated uint32 factorList = 3;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The factorList at the given index.
|
||||
*/
|
||||
@@ -188,21 +199,10 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
}
|
||||
private int factorListMemoizedSerializedSize = -1;
|
||||
|
||||
public static final int ENTRANCE_ID_FIELD_NUMBER = 8;
|
||||
private int entranceId_;
|
||||
/**
|
||||
* <code>uint32 entrance_id = 8;</code>
|
||||
* @return The entranceId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getEntranceId() {
|
||||
return entranceId_;
|
||||
}
|
||||
|
||||
public static final int TEMPLATE_ID_FIELD_NUMBER = 15;
|
||||
public static final int TEMPLATEID_FIELD_NUMBER = 6;
|
||||
private int templateId_;
|
||||
/**
|
||||
* <code>uint32 template_id = 15;</code>
|
||||
* <code>uint32 templateId = 6;</code>
|
||||
* @return The templateId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -225,18 +225,18 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
getSerializedSize();
|
||||
if (entranceId_ != 0) {
|
||||
output.writeUInt32(1, entranceId_);
|
||||
}
|
||||
if (getFactorListList().size() > 0) {
|
||||
output.writeUInt32NoTag(10);
|
||||
output.writeUInt32NoTag(26);
|
||||
output.writeUInt32NoTag(factorListMemoizedSerializedSize);
|
||||
}
|
||||
for (int i = 0; i < factorList_.size(); i++) {
|
||||
output.writeUInt32NoTag(factorList_.getInt(i));
|
||||
}
|
||||
if (entranceId_ != 0) {
|
||||
output.writeUInt32(8, entranceId_);
|
||||
}
|
||||
if (templateId_ != 0) {
|
||||
output.writeUInt32(15, templateId_);
|
||||
output.writeUInt32(6, templateId_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -247,6 +247,10 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (entranceId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(1, entranceId_);
|
||||
}
|
||||
{
|
||||
int dataSize = 0;
|
||||
for (int i = 0; i < factorList_.size(); i++) {
|
||||
@@ -261,13 +265,9 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
}
|
||||
factorListMemoizedSerializedSize = dataSize;
|
||||
}
|
||||
if (entranceId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(8, entranceId_);
|
||||
}
|
||||
if (templateId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(15, templateId_);
|
||||
.computeUInt32Size(6, templateId_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -284,10 +284,10 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo other = (emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo) obj;
|
||||
|
||||
if (!getFactorListList()
|
||||
.equals(other.getFactorListList())) return false;
|
||||
if (getEntranceId()
|
||||
!= other.getEntranceId()) return false;
|
||||
if (!getFactorListList()
|
||||
.equals(other.getFactorListList())) return false;
|
||||
if (getTemplateId()
|
||||
!= other.getTemplateId()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
@@ -301,13 +301,13 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + ENTRANCEID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getEntranceId();
|
||||
if (getFactorListCount() > 0) {
|
||||
hash = (37 * hash) + FACTOR_LIST_FIELD_NUMBER;
|
||||
hash = (37 * hash) + FACTORLIST_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getFactorListList().hashCode();
|
||||
}
|
||||
hash = (37 * hash) + ENTRANCE_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getEntranceId();
|
||||
hash = (37 * hash) + TEMPLATE_ID_FIELD_NUMBER;
|
||||
hash = (37 * hash) + TEMPLATEID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getTemplateId();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
@@ -442,10 +442,10 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
factorList_ = emptyIntList();
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
entranceId_ = 0;
|
||||
|
||||
factorList_ = emptyIntList();
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
templateId_ = 0;
|
||||
|
||||
return this;
|
||||
@@ -475,12 +475,12 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo buildPartial() {
|
||||
emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo result = new emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo(this);
|
||||
int from_bitField0_ = bitField0_;
|
||||
result.entranceId_ = entranceId_;
|
||||
if (((bitField0_ & 0x00000001) != 0)) {
|
||||
factorList_.makeImmutable();
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
}
|
||||
result.factorList_ = factorList_;
|
||||
result.entranceId_ = entranceId_;
|
||||
result.templateId_ = templateId_;
|
||||
onBuilt();
|
||||
return result;
|
||||
@@ -530,6 +530,9 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo other) {
|
||||
if (other == emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.getDefaultInstance()) return this;
|
||||
if (other.getEntranceId() != 0) {
|
||||
setEntranceId(other.getEntranceId());
|
||||
}
|
||||
if (!other.factorList_.isEmpty()) {
|
||||
if (factorList_.isEmpty()) {
|
||||
factorList_ = other.factorList_;
|
||||
@@ -540,9 +543,6 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
}
|
||||
onChanged();
|
||||
}
|
||||
if (other.getEntranceId() != 0) {
|
||||
setEntranceId(other.getEntranceId());
|
||||
}
|
||||
if (other.getTemplateId() != 0) {
|
||||
setTemplateId(other.getTemplateId());
|
||||
}
|
||||
@@ -576,6 +576,37 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
}
|
||||
private int bitField0_;
|
||||
|
||||
private int entranceId_ ;
|
||||
/**
|
||||
* <code>uint32 entranceId = 1;</code>
|
||||
* @return The entranceId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getEntranceId() {
|
||||
return entranceId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 entranceId = 1;</code>
|
||||
* @param value The entranceId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setEntranceId(int value) {
|
||||
|
||||
entranceId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 entranceId = 1;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearEntranceId() {
|
||||
|
||||
entranceId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private com.google.protobuf.Internal.IntList factorList_ = emptyIntList();
|
||||
private void ensureFactorListIsMutable() {
|
||||
if (!((bitField0_ & 0x00000001) != 0)) {
|
||||
@@ -584,7 +615,7 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 factor_list = 1;</code>
|
||||
* <code>repeated uint32 factorList = 3;</code>
|
||||
* @return A list containing the factorList.
|
||||
*/
|
||||
public java.util.List<java.lang.Integer>
|
||||
@@ -593,14 +624,14 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
java.util.Collections.unmodifiableList(factorList_) : factorList_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 factor_list = 1;</code>
|
||||
* <code>repeated uint32 factorList = 3;</code>
|
||||
* @return The count of factorList.
|
||||
*/
|
||||
public int getFactorListCount() {
|
||||
return factorList_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 factor_list = 1;</code>
|
||||
* <code>repeated uint32 factorList = 3;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The factorList at the given index.
|
||||
*/
|
||||
@@ -608,7 +639,7 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
return factorList_.getInt(index);
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 factor_list = 1;</code>
|
||||
* <code>repeated uint32 factorList = 3;</code>
|
||||
* @param index The index to set the value at.
|
||||
* @param value The factorList to set.
|
||||
* @return This builder for chaining.
|
||||
@@ -621,7 +652,7 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 factor_list = 1;</code>
|
||||
* <code>repeated uint32 factorList = 3;</code>
|
||||
* @param value The factorList to add.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -632,7 +663,7 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 factor_list = 1;</code>
|
||||
* <code>repeated uint32 factorList = 3;</code>
|
||||
* @param values The factorList to add.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -645,7 +676,7 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 factor_list = 1;</code>
|
||||
* <code>repeated uint32 factorList = 3;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearFactorList() {
|
||||
@@ -655,40 +686,9 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int entranceId_ ;
|
||||
/**
|
||||
* <code>uint32 entrance_id = 8;</code>
|
||||
* @return The entranceId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getEntranceId() {
|
||||
return entranceId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 entrance_id = 8;</code>
|
||||
* @param value The entranceId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setEntranceId(int value) {
|
||||
|
||||
entranceId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 entrance_id = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearEntranceId() {
|
||||
|
||||
entranceId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int templateId_ ;
|
||||
/**
|
||||
* <code>uint32 template_id = 15;</code>
|
||||
* <code>uint32 templateId = 6;</code>
|
||||
* @return The templateId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -696,7 +696,7 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
return templateId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 template_id = 15;</code>
|
||||
* <code>uint32 templateId = 6;</code>
|
||||
* @param value The templateId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -707,7 +707,7 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 template_id = 15;</code>
|
||||
* <code>uint32 templateId = 6;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearTemplateId() {
|
||||
@@ -783,10 +783,10 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\033ParentQuestRandomInfo.proto\"V\n\025ParentQ" +
|
||||
"uestRandomInfo\022\023\n\013factor_list\030\001 \003(\r\022\023\n\013e" +
|
||||
"ntrance_id\030\010 \001(\r\022\023\n\013template_id\030\017 \001(\rB\033\n" +
|
||||
"\031emu.grasscutter.net.protob\006proto3"
|
||||
"\n\033ParentQuestRandomInfo.proto\"S\n\025ParentQ" +
|
||||
"uestRandomInfo\022\022\n\nentranceId\030\001 \001(\r\022\022\n\nfa" +
|
||||
"ctorList\030\003 \003(\r\022\022\n\ntemplateId\030\006 \001(\rB\033\n\031em" +
|
||||
"u.grasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
@@ -797,7 +797,7 @@ public final class ParentQuestRandomInfoOuterClass {
|
||||
internal_static_ParentQuestRandomInfo_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_ParentQuestRandomInfo_descriptor,
|
||||
new java.lang.String[] { "FactorList", "EntranceId", "TemplateId", });
|
||||
new java.lang.String[] { "EntranceId", "FactorList", "TemplateId", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user