mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-20 12:29:56 +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
+176
-63
@@ -19,17 +19,17 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>int32 retcode = 2;</code>
|
||||
* <code>int32 retcode = 14;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
int getRetcode();
|
||||
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
int getExpeditionInfoMapCount();
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
boolean containsExpeditionInfoMap(
|
||||
long key);
|
||||
@@ -40,35 +40,25 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
|
||||
getExpeditionInfoMap();
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
|
||||
getExpeditionInfoMapMap();
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
|
||||
emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo getExpeditionInfoMapOrDefault(
|
||||
long key,
|
||||
emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo defaultValue);
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
|
||||
emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo getExpeditionInfoMapOrThrow(
|
||||
long key);
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 1702;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code AvatarExpeditionCallBackRsp}
|
||||
*/
|
||||
public static final class AvatarExpeditionCallBackRsp extends
|
||||
@@ -114,11 +104,6 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 16: {
|
||||
|
||||
retcode_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
case 58: {
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
|
||||
expeditionInfoMap_ = com.google.protobuf.MapField.newMapField(
|
||||
@@ -132,6 +117,11 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
expeditionInfoMap__.getKey(), expeditionInfoMap__.getValue());
|
||||
break;
|
||||
}
|
||||
case 112: {
|
||||
|
||||
retcode_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
if (!parseUnknownField(
|
||||
input, unknownFields, extensionRegistry, tag)) {
|
||||
@@ -176,10 +166,141 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp.class, emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp.Builder.class);
|
||||
}
|
||||
|
||||
public static final int RETCODE_FIELD_NUMBER = 2;
|
||||
/**
|
||||
* Protobuf enum {@code AvatarExpeditionCallBackRsp.PAFOHCPJJIP}
|
||||
*/
|
||||
public enum PAFOHCPJJIP
|
||||
implements com.google.protobuf.ProtocolMessageEnum {
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
NONE(0, 0),
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 1632;</code>
|
||||
*/
|
||||
PEPPOHPHJOJ(1, 1632),
|
||||
/**
|
||||
* <code>NNBKOLMPOEA = 1;</code>
|
||||
*/
|
||||
NNBKOLMPOEA(3, 1),
|
||||
UNRECOGNIZED(-1, -1),
|
||||
;
|
||||
|
||||
/**
|
||||
* <code>DCDNILFDFLB = 0;</code>
|
||||
*/
|
||||
public static final PAFOHCPJJIP DCDNILFDFLB = NONE;
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
public static final int NONE_VALUE = 0;
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 1632;</code>
|
||||
*/
|
||||
public static final int PEPPOHPHJOJ_VALUE = 1632;
|
||||
/**
|
||||
* <code>DCDNILFDFLB = 0;</code>
|
||||
*/
|
||||
public static final int DCDNILFDFLB_VALUE = 0;
|
||||
/**
|
||||
* <code>NNBKOLMPOEA = 1;</code>
|
||||
*/
|
||||
public static final int NNBKOLMPOEA_VALUE = 1;
|
||||
|
||||
|
||||
public final int getNumber() {
|
||||
if (index == -1) {
|
||||
throw new java.lang.IllegalArgumentException(
|
||||
"Can't get the number of an unknown enum value.");
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param value The numeric wire value of the corresponding enum entry.
|
||||
* @return The enum associated with the given numeric wire value.
|
||||
* @deprecated Use {@link #forNumber(int)} instead.
|
||||
*/
|
||||
@java.lang.Deprecated
|
||||
public static PAFOHCPJJIP valueOf(int value) {
|
||||
return forNumber(value);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param value The numeric wire value of the corresponding enum entry.
|
||||
* @return The enum associated with the given numeric wire value.
|
||||
*/
|
||||
public static PAFOHCPJJIP forNumber(int value) {
|
||||
switch (value) {
|
||||
case 0: return NONE;
|
||||
case 1632: return PEPPOHPHJOJ;
|
||||
case 1: return NNBKOLMPOEA;
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static com.google.protobuf.Internal.EnumLiteMap<PAFOHCPJJIP>
|
||||
internalGetValueMap() {
|
||||
return internalValueMap;
|
||||
}
|
||||
private static final com.google.protobuf.Internal.EnumLiteMap<
|
||||
PAFOHCPJJIP> internalValueMap =
|
||||
new com.google.protobuf.Internal.EnumLiteMap<PAFOHCPJJIP>() {
|
||||
public PAFOHCPJJIP findValueByNumber(int number) {
|
||||
return PAFOHCPJJIP.forNumber(number);
|
||||
}
|
||||
};
|
||||
|
||||
public final com.google.protobuf.Descriptors.EnumValueDescriptor
|
||||
getValueDescriptor() {
|
||||
if (index == -1) {
|
||||
throw new java.lang.IllegalStateException(
|
||||
"Can't get the descriptor of an unrecognized enum value.");
|
||||
}
|
||||
return getDescriptor().getValues().get(index);
|
||||
}
|
||||
public final com.google.protobuf.Descriptors.EnumDescriptor
|
||||
getDescriptorForType() {
|
||||
return getDescriptor();
|
||||
}
|
||||
public static final com.google.protobuf.Descriptors.EnumDescriptor
|
||||
getDescriptor() {
|
||||
return emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp.getDescriptor().getEnumTypes().get(0);
|
||||
}
|
||||
|
||||
private static final PAFOHCPJJIP[] VALUES = getStaticValuesArray();
|
||||
private static PAFOHCPJJIP[] getStaticValuesArray() {
|
||||
return new PAFOHCPJJIP[] {
|
||||
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
|
||||
};
|
||||
}
|
||||
public static PAFOHCPJJIP valueOf(
|
||||
com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
|
||||
if (desc.getType() != getDescriptor()) {
|
||||
throw new java.lang.IllegalArgumentException(
|
||||
"EnumValueDescriptor is not for this type.");
|
||||
}
|
||||
if (desc.getIndex() == -1) {
|
||||
return UNRECOGNIZED;
|
||||
}
|
||||
return VALUES[desc.getIndex()];
|
||||
}
|
||||
|
||||
private final int index;
|
||||
private final int value;
|
||||
|
||||
private PAFOHCPJJIP(int index, int value) {
|
||||
this.index = index;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(enum_scope:AvatarExpeditionCallBackRsp.PAFOHCPJJIP)
|
||||
}
|
||||
|
||||
public static final int RETCODE_FIELD_NUMBER = 14;
|
||||
private int retcode_;
|
||||
/**
|
||||
* <code>int32 retcode = 2;</code>
|
||||
* <code>int32 retcode = 14;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -187,7 +308,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return retcode_;
|
||||
}
|
||||
|
||||
public static final int EXPEDITION_INFO_MAP_FIELD_NUMBER = 7;
|
||||
public static final int EXPEDITIONINFOMAP_FIELD_NUMBER = 7;
|
||||
private static final class ExpeditionInfoMapDefaultEntryHolder {
|
||||
static final com.google.protobuf.MapEntry<
|
||||
java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo> defaultEntry =
|
||||
@@ -214,7 +335,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return internalGetExpeditionInfoMap().getMap().size();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
|
||||
@java.lang.Override
|
||||
@@ -232,7 +353,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return getExpeditionInfoMapMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -240,7 +361,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return internalGetExpeditionInfoMap().getMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -253,7 +374,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return map.containsKey(key) ? map.get(key) : defaultValue;
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -282,15 +403,15 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (retcode_ != 0) {
|
||||
output.writeInt32(2, retcode_);
|
||||
}
|
||||
com.google.protobuf.GeneratedMessageV3
|
||||
.serializeLongMapTo(
|
||||
output,
|
||||
internalGetExpeditionInfoMap(),
|
||||
ExpeditionInfoMapDefaultEntryHolder.defaultEntry,
|
||||
7);
|
||||
if (retcode_ != 0) {
|
||||
output.writeInt32(14, retcode_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
|
||||
@@ -300,10 +421,6 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (retcode_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(2, retcode_);
|
||||
}
|
||||
for (java.util.Map.Entry<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo> entry
|
||||
: internalGetExpeditionInfoMap().getMap().entrySet()) {
|
||||
com.google.protobuf.MapEntry<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
|
||||
@@ -314,6 +431,10 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeMessageSize(7, expeditionInfoMap__);
|
||||
}
|
||||
if (retcode_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(14, retcode_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
return size;
|
||||
@@ -347,7 +468,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getRetcode();
|
||||
if (!internalGetExpeditionInfoMap().getMap().isEmpty()) {
|
||||
hash = (37 * hash) + EXPEDITION_INFO_MAP_FIELD_NUMBER;
|
||||
hash = (37 * hash) + EXPEDITIONINFOMAP_FIELD_NUMBER;
|
||||
hash = (53 * hash) + internalGetExpeditionInfoMap().hashCode();
|
||||
}
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
@@ -446,16 +567,6 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 1702;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code AvatarExpeditionCallBackRsp}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -633,7 +744,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
|
||||
private int retcode_ ;
|
||||
/**
|
||||
* <code>int32 retcode = 2;</code>
|
||||
* <code>int32 retcode = 14;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -641,7 +752,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return retcode_;
|
||||
}
|
||||
/**
|
||||
* <code>int32 retcode = 2;</code>
|
||||
* <code>int32 retcode = 14;</code>
|
||||
* @param value The retcode to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -652,7 +763,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>int32 retcode = 2;</code>
|
||||
* <code>int32 retcode = 14;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearRetcode() {
|
||||
@@ -689,7 +800,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return internalGetExpeditionInfoMap().getMap().size();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
|
||||
@java.lang.Override
|
||||
@@ -707,7 +818,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return getExpeditionInfoMapMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -715,7 +826,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return internalGetExpeditionInfoMap().getMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -728,7 +839,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return map.containsKey(key) ? map.get(key) : defaultValue;
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -749,7 +860,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
|
||||
public Builder removeExpeditionInfoMap(
|
||||
@@ -768,7 +879,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return internalGetMutableExpeditionInfoMap().getMutableMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
public Builder putExpeditionInfoMap(
|
||||
long key,
|
||||
@@ -780,7 +891,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expedition_info_map = 7;</code>
|
||||
* <code>map<uint64, .AvatarExpeditionInfo> expeditionInfoMap = 7;</code>
|
||||
*/
|
||||
|
||||
public Builder putAllExpeditionInfoMap(
|
||||
@@ -862,13 +973,15 @@ public final class AvatarExpeditionCallBackRspOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n!AvatarExpeditionCallBackRsp.proto\032\032Ava" +
|
||||
"tarExpeditionInfo.proto\"\321\001\n\033AvatarExpedi" +
|
||||
"tionCallBackRsp\022\017\n\007retcode\030\002 \001(\005\022P\n\023expe" +
|
||||
"dition_info_map\030\007 \003(\01323.AvatarExpedition" +
|
||||
"CallBackRsp.ExpeditionInfoMapEntry\032O\n\026Ex" +
|
||||
"peditionInfoMapEntry\022\013\n\003key\030\001 \001(\004\022$\n\005val" +
|
||||
"ue\030\002 \001(\0132\025.AvatarExpeditionInfo:\0028\001B\033\n\031e" +
|
||||
"mu.grasscutter.net.protob\006proto3"
|
||||
"tarExpeditionInfo.proto\"\240\002\n\033AvatarExpedi" +
|
||||
"tionCallBackRsp\022\017\n\007retcode\030\016 \001(\005\022N\n\021expe" +
|
||||
"ditionInfoMap\030\007 \003(\01323.AvatarExpeditionCa" +
|
||||
"llBackRsp.ExpeditionInfoMapEntry\032O\n\026Expe" +
|
||||
"ditionInfoMapEntry\022\013\n\003key\030\001 \001(\004\022$\n\005value" +
|
||||
"\030\002 \001(\0132\025.AvatarExpeditionInfo:\0028\001\"O\n\013PAF" +
|
||||
"OHCPJJIP\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\340\014\022\017\n\013" +
|
||||
"DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031em" +
|
||||
"u.grasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
||||
Reference in New Issue
Block a user