diff --git a/SceneEntityDrownReqOuterClass.java b/SceneEntityDrownReqOuterClass.java
deleted file mode 100644
index cf1deb8..0000000
--- a/SceneEntityDrownReqOuterClass.java
+++ /dev/null
@@ -1,677 +0,0 @@
-// Generated by the protocol buffer compiler. DO NOT EDIT!
-// source: SceneEntityDrownReq.proto
-
-public final class SceneEntityDrownReqOuterClass {
- private SceneEntityDrownReqOuterClass() {}
- public static void registerAllExtensions(
- com.google.protobuf.ExtensionRegistryLite registry) {
- }
-
- public static void registerAllExtensions(
- com.google.protobuf.ExtensionRegistry registry) {
- registerAllExtensions(
- (com.google.protobuf.ExtensionRegistryLite) registry);
- }
- public interface SceneEntityDrownReqOrBuilder extends
- // @@protoc_insertion_point(interface_extends:SceneEntityDrownReq)
- com.google.protobuf.MessageOrBuilder {
-
- /**
- * uint32 entity_id = 1;
- * @return The entityId.
- */
- int getEntityId();
- }
- /**
- * Protobuf type {@code SceneEntityDrownReq}
- */
- public static final class SceneEntityDrownReq extends
- com.google.protobuf.GeneratedMessageV3 implements
- // @@protoc_insertion_point(message_implements:SceneEntityDrownReq)
- SceneEntityDrownReqOrBuilder {
- private static final long serialVersionUID = 0L;
- // Use SceneEntityDrownReq.newBuilder() to construct.
- private SceneEntityDrownReq(com.google.protobuf.GeneratedMessageV3.Builder builder) {
- super(builder);
- }
- private SceneEntityDrownReq() {
- }
-
- @java.lang.Override
- @SuppressWarnings({"unused"})
- protected java.lang.Object newInstance(
- UnusedPrivateParameter unused) {
- return new SceneEntityDrownReq();
- }
-
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
- getUnknownFields() {
- return this.unknownFields;
- }
- private SceneEntityDrownReq(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- this();
- if (extensionRegistry == null) {
- throw new java.lang.NullPointerException();
- }
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
- try {
- boolean done = false;
- while (!done) {
- int tag = input.readTag();
- switch (tag) {
- case 0:
- done = true;
- break;
- case 8: {
-
- entityId_ = input.readUInt32();
- break;
- }
- default: {
- if (!parseUnknownField(
- input, unknownFields, extensionRegistry, tag)) {
- done = true;
- }
- break;
- }
- }
- }
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- throw e.setUnfinishedMessage(this);
- } catch (com.google.protobuf.UninitializedMessageException e) {
- throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
- } catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
- e).setUnfinishedMessage(this);
- } finally {
- this.unknownFields = unknownFields.build();
- makeExtensionsImmutable();
- }
- }
- public static final com.google.protobuf.Descriptors.Descriptor
- getDescriptor() {
- return SceneEntityDrownReqOuterClass.internal_static_SceneEntityDrownReq_descriptor;
- }
-
- @java.lang.Override
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
- internalGetFieldAccessorTable() {
- return SceneEntityDrownReqOuterClass.internal_static_SceneEntityDrownReq_fieldAccessorTable
- .ensureFieldAccessorsInitialized(
- SceneEntityDrownReqOuterClass.SceneEntityDrownReq.class, SceneEntityDrownReqOuterClass.SceneEntityDrownReq.Builder.class);
- }
-
- /**
- * Protobuf enum {@code SceneEntityDrownReq.CmdId}
- */
- public enum CmdId
- implements com.google.protobuf.ProtocolMessageEnum {
- /**
- * ENET_CHANNEL_ID = 0;
- */
- ENET_CHANNEL_ID(0, 0),
- /**
- * ENET_IS_RELIABLE = 1;
- */
- ENET_IS_RELIABLE(2, 1),
- /**
- * CMD_ID = 222;
- */
- CMD_ID(4, 222),
- UNRECOGNIZED(-1, -1),
- ;
-
- /**
- * NONE = 0;
- */
- public static final CmdId NONE = ENET_CHANNEL_ID;
- /**
- * IS_ALLOW_CLIENT = 1;
- */
- public static final CmdId IS_ALLOW_CLIENT = ENET_IS_RELIABLE;
- /**
- * ENET_CHANNEL_ID = 0;
- */
- public static final int ENET_CHANNEL_ID_VALUE = 0;
- /**
- * NONE = 0;
- */
- public static final int NONE_VALUE = 0;
- /**
- * ENET_IS_RELIABLE = 1;
- */
- public static final int ENET_IS_RELIABLE_VALUE = 1;
- /**
- * IS_ALLOW_CLIENT = 1;
- */
- public static final int IS_ALLOW_CLIENT_VALUE = 1;
- /**
- * CMD_ID = 222;
- */
- public static final int CMD_ID_VALUE = 222;
-
-
- 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 CmdId 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 CmdId forNumber(int value) {
- switch (value) {
- case 0: return ENET_CHANNEL_ID;
- case 1: return ENET_IS_RELIABLE;
- case 222: return CMD_ID;
- default: return null;
- }
- }
-
- public static com.google.protobuf.Internal.EnumLiteMap
- internalGetValueMap() {
- return internalValueMap;
- }
- private static final com.google.protobuf.Internal.EnumLiteMap<
- CmdId> internalValueMap =
- new com.google.protobuf.Internal.EnumLiteMap() {
- public CmdId findValueByNumber(int number) {
- return CmdId.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 SceneEntityDrownReqOuterClass.SceneEntityDrownReq.getDescriptor().getEnumTypes().get(0);
- }
-
- private static final CmdId[] VALUES = getStaticValuesArray();
- private static CmdId[] getStaticValuesArray() {
- return new CmdId[] {
- ENET_CHANNEL_ID, NONE, ENET_IS_RELIABLE, IS_ALLOW_CLIENT, CMD_ID,
- };
- }
- public static CmdId 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 CmdId(int index, int value) {
- this.index = index;
- this.value = value;
- }
-
- // @@protoc_insertion_point(enum_scope:SceneEntityDrownReq.CmdId)
- }
-
- public static final int ENTITY_ID_FIELD_NUMBER = 1;
- private int entityId_;
- /**
- * uint32 entity_id = 1;
- * @return The entityId.
- */
- @java.lang.Override
- public int getEntityId() {
- return entityId_;
- }
-
- private byte memoizedIsInitialized = -1;
- @java.lang.Override
- public final boolean isInitialized() {
- byte isInitialized = memoizedIsInitialized;
- if (isInitialized == 1) return true;
- if (isInitialized == 0) return false;
-
- memoizedIsInitialized = 1;
- return true;
- }
-
- @java.lang.Override
- public void writeTo(com.google.protobuf.CodedOutputStream output)
- throws java.io.IOException {
- if (entityId_ != 0) {
- output.writeUInt32(1, entityId_);
- }
- unknownFields.writeTo(output);
- }
-
- @java.lang.Override
- public int getSerializedSize() {
- int size = memoizedSize;
- if (size != -1) return size;
-
- size = 0;
- if (entityId_ != 0) {
- size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(1, entityId_);
- }
- size += unknownFields.getSerializedSize();
- memoizedSize = size;
- return size;
- }
-
- @java.lang.Override
- public boolean equals(final java.lang.Object obj) {
- if (obj == this) {
- return true;
- }
- if (!(obj instanceof SceneEntityDrownReqOuterClass.SceneEntityDrownReq)) {
- return super.equals(obj);
- }
- SceneEntityDrownReqOuterClass.SceneEntityDrownReq other = (SceneEntityDrownReqOuterClass.SceneEntityDrownReq) obj;
-
- if (getEntityId()
- != other.getEntityId()) return false;
- if (!unknownFields.equals(other.unknownFields)) return false;
- return true;
- }
-
- @java.lang.Override
- public int hashCode() {
- if (memoizedHashCode != 0) {
- return memoizedHashCode;
- }
- int hash = 41;
- hash = (19 * hash) + getDescriptor().hashCode();
- hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
- hash = (53 * hash) + getEntityId();
- hash = (29 * hash) + unknownFields.hashCode();
- memoizedHashCode = hash;
- return hash;
- }
-
- public static SceneEntityDrownReqOuterClass.SceneEntityDrownReq parseFrom(
- java.nio.ByteBuffer data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
- public static SceneEntityDrownReqOuterClass.SceneEntityDrownReq parseFrom(
- java.nio.ByteBuffer data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
- public static SceneEntityDrownReqOuterClass.SceneEntityDrownReq parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
- public static SceneEntityDrownReqOuterClass.SceneEntityDrownReq parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
- public static SceneEntityDrownReqOuterClass.SceneEntityDrownReq parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
- public static SceneEntityDrownReqOuterClass.SceneEntityDrownReq parseFrom(
- byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
- public static SceneEntityDrownReqOuterClass.SceneEntityDrownReq parseFrom(java.io.InputStream input)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3
- .parseWithIOException(PARSER, input);
- }
- public static SceneEntityDrownReqOuterClass.SceneEntityDrownReq parseFrom(
- java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3
- .parseWithIOException(PARSER, input, extensionRegistry);
- }
- public static SceneEntityDrownReqOuterClass.SceneEntityDrownReq parseDelimitedFrom(java.io.InputStream input)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3
- .parseDelimitedWithIOException(PARSER, input);
- }
- public static SceneEntityDrownReqOuterClass.SceneEntityDrownReq parseDelimitedFrom(
- java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3
- .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
- }
- public static SceneEntityDrownReqOuterClass.SceneEntityDrownReq parseFrom(
- com.google.protobuf.CodedInputStream input)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3
- .parseWithIOException(PARSER, input);
- }
- public static SceneEntityDrownReqOuterClass.SceneEntityDrownReq parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3
- .parseWithIOException(PARSER, input, extensionRegistry);
- }
-
- @java.lang.Override
- public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder() {
- return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(SceneEntityDrownReqOuterClass.SceneEntityDrownReq prototype) {
- return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
- @java.lang.Override
- public Builder toBuilder() {
- return this == DEFAULT_INSTANCE
- ? new Builder() : new Builder().mergeFrom(this);
- }
-
- @java.lang.Override
- protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
- Builder builder = new Builder(parent);
- return builder;
- }
- /**
- * Protobuf type {@code SceneEntityDrownReq}
- */
- public static final class Builder extends
- com.google.protobuf.GeneratedMessageV3.Builder implements
- // @@protoc_insertion_point(builder_implements:SceneEntityDrownReq)
- SceneEntityDrownReqOuterClass.SceneEntityDrownReqOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
- getDescriptor() {
- return SceneEntityDrownReqOuterClass.internal_static_SceneEntityDrownReq_descriptor;
- }
-
- @java.lang.Override
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
- internalGetFieldAccessorTable() {
- return SceneEntityDrownReqOuterClass.internal_static_SceneEntityDrownReq_fieldAccessorTable
- .ensureFieldAccessorsInitialized(
- SceneEntityDrownReqOuterClass.SceneEntityDrownReq.class, SceneEntityDrownReqOuterClass.SceneEntityDrownReq.Builder.class);
- }
-
- // Construct using SceneEntityDrownReqOuterClass.SceneEntityDrownReq.newBuilder()
- private Builder() {
- maybeForceBuilderInitialization();
- }
-
- private Builder(
- com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
- super(parent);
- maybeForceBuilderInitialization();
- }
- private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessageV3
- .alwaysUseFieldBuilders) {
- }
- }
- @java.lang.Override
- public Builder clear() {
- super.clear();
- entityId_ = 0;
-
- return this;
- }
-
- @java.lang.Override
- public com.google.protobuf.Descriptors.Descriptor
- getDescriptorForType() {
- return SceneEntityDrownReqOuterClass.internal_static_SceneEntityDrownReq_descriptor;
- }
-
- @java.lang.Override
- public SceneEntityDrownReqOuterClass.SceneEntityDrownReq getDefaultInstanceForType() {
- return SceneEntityDrownReqOuterClass.SceneEntityDrownReq.getDefaultInstance();
- }
-
- @java.lang.Override
- public SceneEntityDrownReqOuterClass.SceneEntityDrownReq build() {
- SceneEntityDrownReqOuterClass.SceneEntityDrownReq result = buildPartial();
- if (!result.isInitialized()) {
- throw newUninitializedMessageException(result);
- }
- return result;
- }
-
- @java.lang.Override
- public SceneEntityDrownReqOuterClass.SceneEntityDrownReq buildPartial() {
- SceneEntityDrownReqOuterClass.SceneEntityDrownReq result = new SceneEntityDrownReqOuterClass.SceneEntityDrownReq(this);
- result.entityId_ = entityId_;
- onBuilt();
- return result;
- }
-
- @java.lang.Override
- public Builder clone() {
- return super.clone();
- }
- @java.lang.Override
- public Builder setField(
- com.google.protobuf.Descriptors.FieldDescriptor field,
- java.lang.Object value) {
- return super.setField(field, value);
- }
- @java.lang.Override
- public Builder clearField(
- com.google.protobuf.Descriptors.FieldDescriptor field) {
- return super.clearField(field);
- }
- @java.lang.Override
- public Builder clearOneof(
- com.google.protobuf.Descriptors.OneofDescriptor oneof) {
- return super.clearOneof(oneof);
- }
- @java.lang.Override
- public Builder setRepeatedField(
- com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, java.lang.Object value) {
- return super.setRepeatedField(field, index, value);
- }
- @java.lang.Override
- public Builder addRepeatedField(
- com.google.protobuf.Descriptors.FieldDescriptor field,
- java.lang.Object value) {
- return super.addRepeatedField(field, value);
- }
- @java.lang.Override
- public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof SceneEntityDrownReqOuterClass.SceneEntityDrownReq) {
- return mergeFrom((SceneEntityDrownReqOuterClass.SceneEntityDrownReq)other);
- } else {
- super.mergeFrom(other);
- return this;
- }
- }
-
- public Builder mergeFrom(SceneEntityDrownReqOuterClass.SceneEntityDrownReq other) {
- if (other == SceneEntityDrownReqOuterClass.SceneEntityDrownReq.getDefaultInstance()) return this;
- if (other.getEntityId() != 0) {
- setEntityId(other.getEntityId());
- }
- this.mergeUnknownFields(other.unknownFields);
- onChanged();
- return this;
- }
-
- @java.lang.Override
- public final boolean isInitialized() {
- return true;
- }
-
- @java.lang.Override
- public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- SceneEntityDrownReqOuterClass.SceneEntityDrownReq parsedMessage = null;
- try {
- parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (SceneEntityDrownReqOuterClass.SceneEntityDrownReq) e.getUnfinishedMessage();
- throw e.unwrapIOException();
- } finally {
- if (parsedMessage != null) {
- mergeFrom(parsedMessage);
- }
- }
- return this;
- }
-
- private int entityId_ ;
- /**
- * uint32 entity_id = 1;
- * @return The entityId.
- */
- @java.lang.Override
- public int getEntityId() {
- return entityId_;
- }
- /**
- * uint32 entity_id = 1;
- * @param value The entityId to set.
- * @return This builder for chaining.
- */
- public Builder setEntityId(int value) {
-
- entityId_ = value;
- onChanged();
- return this;
- }
- /**
- * uint32 entity_id = 1;
- * @return This builder for chaining.
- */
- public Builder clearEntityId() {
-
- entityId_ = 0;
- onChanged();
- return this;
- }
- @java.lang.Override
- public final Builder setUnknownFields(
- final com.google.protobuf.UnknownFieldSet unknownFields) {
- return super.setUnknownFields(unknownFields);
- }
-
- @java.lang.Override
- public final Builder mergeUnknownFields(
- final com.google.protobuf.UnknownFieldSet unknownFields) {
- return super.mergeUnknownFields(unknownFields);
- }
-
-
- // @@protoc_insertion_point(builder_scope:SceneEntityDrownReq)
- }
-
- // @@protoc_insertion_point(class_scope:SceneEntityDrownReq)
- private static final SceneEntityDrownReqOuterClass.SceneEntityDrownReq DEFAULT_INSTANCE;
- static {
- DEFAULT_INSTANCE = new SceneEntityDrownReqOuterClass.SceneEntityDrownReq();
- }
-
- public static SceneEntityDrownReqOuterClass.SceneEntityDrownReq getDefaultInstance() {
- return DEFAULT_INSTANCE;
- }
-
- private static final com.google.protobuf.Parser
- PARSER = new com.google.protobuf.AbstractParser() {
- @java.lang.Override
- public SceneEntityDrownReq parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return new SceneEntityDrownReq(input, extensionRegistry);
- }
- };
-
- public static com.google.protobuf.Parser parser() {
- return PARSER;
- }
-
- @java.lang.Override
- public com.google.protobuf.Parser getParserForType() {
- return PARSER;
- }
-
- @java.lang.Override
- public SceneEntityDrownReqOuterClass.SceneEntityDrownReq getDefaultInstanceForType() {
- return DEFAULT_INSTANCE;
- }
-
- }
-
- private static final com.google.protobuf.Descriptors.Descriptor
- internal_static_SceneEntityDrownReq_descriptor;
- private static final
- com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
- internal_static_SceneEntityDrownReq_fieldAccessorTable;
-
- public static com.google.protobuf.Descriptors.FileDescriptor
- getDescriptor() {
- return descriptor;
- }
- private static com.google.protobuf.Descriptors.FileDescriptor
- descriptor;
- static {
- java.lang.String[] descriptorData = {
- "\n\031SceneEntityDrownReq.proto\"\214\001\n\023SceneEnt" +
- "ityDrownReq\022\021\n\tentity_id\030\001 \001(\r\"b\n\005CmdId\022" +
- "\023\n\017ENET_CHANNEL_ID\020\000\022\010\n\004NONE\020\000\022\024\n\020ENET_I" +
- "S_RELIABLE\020\001\022\023\n\017IS_ALLOW_CLIENT\020\001\022\013\n\006CMD" +
- "_ID\020\336\001\032\002\020\001b\006proto3"
- };
- descriptor = com.google.protobuf.Descriptors.FileDescriptor
- .internalBuildGeneratedFileFrom(descriptorData,
- new com.google.protobuf.Descriptors.FileDescriptor[] {
- });
- internal_static_SceneEntityDrownReq_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_SceneEntityDrownReq_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
- internal_static_SceneEntityDrownReq_descriptor,
- new java.lang.String[] { "EntityId", });
- }
-
- // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/proto/AbilityAppliedAbility.proto b/proto/AbilityAppliedAbility.proto
old mode 100644
new mode 100755
index f9fd845..87b0955
--- a/proto/AbilityAppliedAbility.proto
+++ b/proto/AbilityAppliedAbility.proto
@@ -2,12 +2,12 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "AbilityScalarValueEntry.proto";
import "AbilityString.proto";
+import "AbilityScalarValueEntry.proto";
message AbilityAppliedAbility {
- AbilityString abilityName = 1;
- AbilityString abilityOverride = 2;
- repeated AbilityScalarValueEntry overrideMap = 3;
- uint32 instancedAbilityId = 4;
+ AbilityString ability_name = 1;
+ AbilityString ability_override = 2;
+ repeated AbilityScalarValueEntry override_map = 3;
+ uint32 instanced_ability_id = 4;
}
diff --git a/proto/AbilityAppliedModifier.proto b/proto/AbilityAppliedModifier.proto
old mode 100644
new mode 100755
index 857fd8c..82972e6
--- a/proto/AbilityAppliedModifier.proto
+++ b/proto/AbilityAppliedModifier.proto
@@ -2,22 +2,22 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "AbilityAttachedModifier.proto";
import "AbilityString.proto";
+import "AbilityAttachedModifier.proto";
import "ModifierDurability.proto";
message AbilityAppliedModifier {
- int32 modifierLocalId = 1;
- uint32 parentAbilityEntityId = 2;
- AbilityString parentAbilityName = 3;
- AbilityString parentAbilityOverride = 4;
- uint32 instancedAbilityId = 5;
- uint32 instancedModifierId = 6;
- float existDuration = 7;
- AbilityAttachedModifier attachedInstancedModifier = 8;
- uint32 applyEntityId = 9;
- bool isAttachedParentAbility = 10;
- ModifierDurability modifierDurability = 11;
- uint32 sbuffUid = 12;
- bool isServerbuffModifier = 13;
+ int32 modifier_local_id = 1;
+ uint32 parent_ability_entity_id = 2;
+ AbilityString parent_ability_name = 3;
+ AbilityString parent_ability_override = 4;
+ uint32 instanced_ability_id = 5;
+ uint32 instanced_modifier_id = 6;
+ float exist_duration = 7;
+ AbilityAttachedModifier attached_instanced_modifier = 8;
+ uint32 apply_entity_id = 9;
+ bool is_attached_parent_ability = 10;
+ ModifierDurability modifier_durability = 11;
+ uint32 sbuff_uid = 12;
+ bool is_serverbuff_modifier = 13;
}
diff --git a/proto/AbilityAttachedModifier.proto b/proto/AbilityAttachedModifier.proto
old mode 100644
new mode 100755
index c99cb84..8f996b4
--- a/proto/AbilityAttachedModifier.proto
+++ b/proto/AbilityAttachedModifier.proto
@@ -2,10 +2,11 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AbilityAttachedModifier {
- bool isInvalid = 1;
- uint32 ownerEntityId = 2;
- uint32 instancedModifierId = 3;
- bool isServerbuffModifier = 4;
- int32 attachNameHash = 5;
+ bool is_invalid = 1;
+ uint32 owner_entity_id = 2;
+ uint32 instanced_modifier_id = 3;
+ bool is_serverbuff_modifier = 4;
+ int32 attach_name_hash = 5;
}
diff --git a/proto/AbilityChangeNotify.proto b/proto/AbilityChangeNotify.proto
old mode 100644
new mode 100755
index 4a3a63e..9dfa12e
--- a/proto/AbilityChangeNotify.proto
+++ b/proto/AbilityChangeNotify.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "AbilityControlBlock.proto";
message AbilityChangeNotify {
- uint32 entityId = 1;
- AbilityControlBlock abilityControlBlock = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1112;
+ }
+
+ uint32 entity_id = 1;
+ AbilityControlBlock ability_control_block = 2;
}
diff --git a/proto/AbilityControlBlock.proto b/proto/AbilityControlBlock.proto
old mode 100644
new mode 100755
index d47c3c9..eaf2e1e
--- a/proto/AbilityControlBlock.proto
+++ b/proto/AbilityControlBlock.proto
@@ -5,5 +5,5 @@ option java_package = "emu.grasscutter.net.proto";
import "AbilityEmbryo.proto";
message AbilityControlBlock {
- repeated AbilityEmbryo abilityEmbryoList = 1;
+ repeated AbilityEmbryo ability_embryo_list = 1;
}
diff --git a/proto/AbilityEmbryo.proto b/proto/AbilityEmbryo.proto
old mode 100644
new mode 100755
index edbb26b..e21840e
--- a/proto/AbilityEmbryo.proto
+++ b/proto/AbilityEmbryo.proto
@@ -2,8 +2,9 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AbilityEmbryo {
- uint32 abilityId = 1;
- fixed32 abilityNameHash = 2;
- fixed32 abilityOverrideNameHash = 3;
+ uint32 ability_id = 1;
+ fixed32 ability_name_hash = 2;
+ fixed32 ability_override_name_hash = 3;
}
diff --git a/proto/AbilityGadgetInfo.proto b/proto/AbilityGadgetInfo.proto
new file mode 100644
index 0000000..94afb78
--- /dev/null
+++ b/proto/AbilityGadgetInfo.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message AbilityGadgetInfo {
+ uint32 camp_id = 1;
+ uint32 camp_target_type = 2;
+ uint32 target_entity_id = 3;
+}
diff --git a/proto/AbilityIdentifier.proto b/proto/AbilityIdentifier.proto
old mode 100644
new mode 100755
index f1ddecd..e771d23
--- a/proto/AbilityIdentifier.proto
+++ b/proto/AbilityIdentifier.proto
@@ -2,11 +2,12 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AbilityIdentifier {
- uint32 instancedAbilityId = 1;
- uint32 abilityCasterId = 2;
- int32 localId = 3;
- uint32 instancedModifierId = 4;
- uint32 modifierOwnerId = 5;
- bool isServerbuffModifier = 6;
+ uint32 instanced_ability_id = 1;
+ uint32 ability_caster_id = 2;
+ int32 local_id = 3;
+ uint32 instanced_modifier_id = 4;
+ uint32 modifier_owner_id = 5;
+ bool is_serverbuff_modifier = 6;
}
diff --git a/proto/AbilityInvocationsNotify.proto b/proto/AbilityInvocationsNotify.proto
old mode 100644
new mode 100755
index a385354..bf37fd5
--- a/proto/AbilityInvocationsNotify.proto
+++ b/proto/AbilityInvocationsNotify.proto
@@ -5,5 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "AbilityInvokeEntry.proto";
message AbilityInvocationsNotify {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1118;
+ }
+
repeated AbilityInvokeEntry invokes = 1;
}
diff --git a/proto/AbilityInvokeArgument.proto b/proto/AbilityInvokeArgument.proto
old mode 100644
new mode 100755
index a569832..ec8eb0f
--- a/proto/AbilityInvokeArgument.proto
+++ b/proto/AbilityInvokeArgument.proto
@@ -3,46 +3,52 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum AbilityInvokeArgument {
- AbilityNone = 0;
- AbilityMetaModifierChange = 1;
- AbilityMetaCommandModifierChangeRequest = 2;
- AbilityMetaSpecialFloatArgument = 3;
- AbilityMetaOverrideParam = 4;
- AbilityMetaClearOverrideParam = 5;
- AbilityMetaReinitOverridemap = 6;
- AbilityMetaGlobalFloatValue = 7;
- AbilityMetaClearGlobalFloatValue = 8;
- AbilityMetaAbilityElementStrength = 9;
- AbilityMetaAddOrGetAbilityAndTrigger = 10;
- AbilityMetaSetKilledSetate = 11;
- AbilityMetaSetAbilityTrigger = 12;
- AbilityMetaAddNewAbility = 13;
- AbilityMetaRemoveAbility = 14;
- AbilityMetaSetModifierApplyEntity = 15;
- AbilityMetaModifierDurabilityChange = 16;
- AbilityMetaElementReactionVisual = 17;
- AbilityMetaSetPoseParameter = 18;
- AbilityMetaUpdateBaseReactionDamage = 19;
- AbilityActionTriggerAbility = 50;
- AbilityActionSetCrashDamage = 51;
- AbilityActionEffect = 52;
- AbilityActionSummon = 53;
- AbilityActionBlink = 54;
- AbilityActionCreateGadget = 55;
- AbilityActionApplyLevelModifier = 56;
- AbilityActionGenerateElemBall = 57;
- AbilityActionSetRandomOverrideMapValue = 58;
- AbilityActionServerMonsterLog = 59;
- AbilityMixinAvatarSteerByCamera = 100;
- AbilityMixinMonsterDefend = 101;
- AbilityMixinWindZone = 102;
- AbilityMixinCostStamina = 103;
- AbilityMixinEliteShield = 104;
- AbilityMixinElementShield = 105;
- AbilityMixinGlobalShield = 106;
- AbilityMixinShieldBar = 107;
- AbilityMixinWindSeedSpawner = 108;
- AbilityMixinDoActionByElementReaction = 109;
- AbilityMixinFieldEntityCountChange = 110;
- AbilityMixinScenePropSync = 111;
+ ABILITY_NONE = 0;
+ ABILITY_META_MODIFIER_CHANGE = 1;
+ ABILITY_META_COMMAND_MODIFIER_CHANGE_REQUEST = 2;
+ ABILITY_META_SPECIAL_FLOAT_ARGUMENT = 3;
+ ABILITY_META_OVERRIDE_PARAM = 4;
+ ABILITY_META_CLEAR_OVERRIDE_PARAM = 5;
+ ABILITY_META_REINIT_OVERRIDEMAP = 6;
+ ABILITY_META_GLOBAL_FLOAT_VALUE = 7;
+ ABILITY_META_CLEAR_GLOBAL_FLOAT_VALUE = 8;
+ ABILITY_META_ABILITY_ELEMENT_STRENGTH = 9;
+ ABILITY_META_ADD_OR_GET_ABILITY_AND_TRIGGER = 10;
+ ABILITY_META_SET_KILLED_SETATE = 11;
+ ABILITY_META_SET_ABILITY_TRIGGER = 12;
+ ABILITY_META_ADD_NEW_ABILITY = 13;
+ ABILITY_META_REMOVE_ABILITY = 14;
+ ABILITY_META_SET_MODIFIER_APPLY_ENTITY = 15;
+ ABILITY_META_MODIFIER_DURABILITY_CHANGE = 16;
+ ABILITY_META_ELEMENT_REACTION_VISUAL = 17;
+ ABILITY_META_SET_POSE_PARAMETER = 18;
+ ABILITY_META_UPDATE_BASE_REACTION_DAMAGE = 19;
+ ABILITY_META_TRIGGER_ELEMENT_REACTION = 20;
+ ABILITY_META_LOSE_HP = 21;
+ ABILITY_ACTION_TRIGGER_ABILITY = 50;
+ ABILITY_ACTION_SET_CRASH_DAMAGE = 51;
+ ABILITY_ACTION_EFFECT = 52;
+ ABILITY_ACTION_SUMMON = 53;
+ ABILITY_ACTION_BLINK = 54;
+ ABILITY_ACTION_CREATE_GADGET = 55;
+ ABILITY_ACTION_APPLY_LEVEL_MODIFIER = 56;
+ ABILITY_ACTION_GENERATE_ELEM_BALL = 57;
+ ABILITY_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE = 58;
+ ABILITY_ACTION_SERVER_MONSTER_LOG = 59;
+ ABILITY_ACTION_CREATE_TILE = 60;
+ ABILITY_ACTION_DESTROY_TILE = 61;
+ ABILITY_ACTION_FIRE_AFTER_IMAGE = 62;
+ ABILITY_MIXIN_AVATAR_STEER_BY_CAMERA = 100;
+ ABILITY_MIXIN_MONSTER_DEFEND = 101;
+ ABILITY_MIXIN_WIND_ZONE = 102;
+ ABILITY_MIXIN_COST_STAMINA = 103;
+ ABILITY_MIXIN_ELITE_SHIELD = 104;
+ ABILITY_MIXIN_ELEMENT_SHIELD = 105;
+ ABILITY_MIXIN_GLOBAL_SHIELD = 106;
+ ABILITY_MIXIN_SHIELD_BAR = 107;
+ ABILITY_MIXIN_WIND_SEED_SPAWNER = 108;
+ ABILITY_MIXIN_DO_ACTION_BY_ELEMENT_REACTION = 109;
+ ABILITY_MIXIN_FIELD_ENTITY_COUNT_CHANGE = 110;
+ ABILITY_MIXIN_SCENE_PROP_SYNC = 111;
+ ABILITY_MIXIN_WIDGET_MP_SUPPORT = 112;
}
diff --git a/proto/AbilityInvokeEntry.proto b/proto/AbilityInvokeEntry.proto
old mode 100644
new mode 100755
index 9a31043..6c0fcdf
--- a/proto/AbilityInvokeEntry.proto
+++ b/proto/AbilityInvokeEntry.proto
@@ -2,16 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "AbilityInvokeArgument.proto";
import "AbilityInvokeEntryHead.proto";
+import "AbilityInvokeArgument.proto";
import "ForwardType.proto";
message AbilityInvokeEntry {
AbilityInvokeEntryHead head = 1;
- AbilityInvokeArgument argumentType = 2;
- bytes abilityData = 3;
- uint32 entityId = 4;
- ForwardType forwardType = 5;
- uint32 forwardPeer = 6;
- uint32 eventId = 7;
+ AbilityInvokeArgument argument_type = 2;
+ bytes ability_data = 3;
+ uint32 entity_id = 4;
+ ForwardType forward_type = 5;
+ uint32 forward_peer = 6;
+ uint32 event_id = 7;
+ double total_tick_time = 8;
}
diff --git a/proto/AbilityInvokeEntryHead.proto b/proto/AbilityInvokeEntryHead.proto
old mode 100644
new mode 100755
index de7196c..649f0d4
--- a/proto/AbilityInvokeEntryHead.proto
+++ b/proto/AbilityInvokeEntryHead.proto
@@ -2,12 +2,13 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AbilityInvokeEntryHead {
- uint32 instancedAbilityId = 1;
- uint32 instancedModifierId = 2;
- int32 localId = 3;
- int32 modifierConfigLocalId = 4;
- uint32 targetId = 5;
- bool isServerbuffModifier = 6;
- uint32 serverBuffUid = 7;
+ uint32 instanced_ability_id = 1;
+ uint32 instanced_modifier_id = 2;
+ int32 local_id = 3;
+ int32 modifier_config_local_id = 4;
+ uint32 target_id = 5;
+ bool is_serverbuff_modifier = 6;
+ uint32 server_buff_uid = 7;
}
diff --git a/proto/AbilityMixinRecoverInfo.proto b/proto/AbilityMixinRecoverInfo.proto
old mode 100644
new mode 100755
index a23f0d4..ac08597
--- a/proto/AbilityMixinRecoverInfo.proto
+++ b/proto/AbilityMixinRecoverInfo.proto
@@ -5,12 +5,12 @@ option java_package = "emu.grasscutter.net.proto";
import "MassivePropSyncInfo.proto";
message AbilityMixinRecoverInfo {
- oneof source {
- uint32 instancedAbilityId = 1;
- uint32 instancedModifierId = 2;
+ oneof Source {
+ uint32 instanced_ability_id = 1;
+ uint32 instanced_modifier_id = 2;
}
- uint32 localId = 3;
- repeated uint32 dataList = 4;
- bool isServerbuffModifier = 5;
- repeated MassivePropSyncInfo massivePropList = 6;
+ uint32 local_id = 3;
+ repeated uint32 data_list = 4;
+ bool is_serverbuff_modifier = 5;
+ repeated MassivePropSyncInfo massive_prop_list = 6;
}
diff --git a/proto/AbilityScalarType.proto b/proto/AbilityScalarType.proto
old mode 100644
new mode 100755
index 9f5ce16..3901562
--- a/proto/AbilityScalarType.proto
+++ b/proto/AbilityScalarType.proto
@@ -3,11 +3,11 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum AbilityScalarType {
- Unknow = 0;
- Float = 1;
- Int = 2;
- Bool = 3;
- Trigger = 4;
- String = 5;
- Uint = 6;
+ UNKNOW = 0;
+ FLOAT = 1;
+ INT = 2;
+ BOOL = 3;
+ TRIGGER = 4;
+ STRING = 5;
+ UINT = 6;
}
diff --git a/proto/AbilityScalarValueEntry.proto b/proto/AbilityScalarValueEntry.proto
old mode 100644
new mode 100755
index 7455d99..2f51275
--- a/proto/AbilityScalarValueEntry.proto
+++ b/proto/AbilityScalarValueEntry.proto
@@ -2,16 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "AbilityScalarType.proto";
import "AbilityString.proto";
+import "AbilityScalarType.proto";
message AbilityScalarValueEntry {
- AbilityString key = 1;
- AbilityScalarType valueType = 2;
- oneof value {
- float floatValue = 3;
- string stringValue = 4;
- int32 intValue = 5;
- uint32 uintValue = 6;
+ oneof Value {
+ float float_value = 3;
+ string string_value = 4;
+ int32 int_value = 5;
+ uint32 uint_value = 6;
}
+ AbilityString key = 1;
+ AbilityScalarType value_type = 2;
}
diff --git a/proto/AbilityString.proto b/proto/AbilityString.proto
old mode 100644
new mode 100755
index 1e8254a..8462b36
--- a/proto/AbilityString.proto
+++ b/proto/AbilityString.proto
@@ -2,8 +2,9 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AbilityString {
- oneof type {
+ oneof Type {
string str = 1;
uint32 hash = 2;
}
diff --git a/proto/AbilitySyncStateInfo.proto b/proto/AbilitySyncStateInfo.proto
old mode 100644
new mode 100755
index ec103e2..2fab5e3
--- a/proto/AbilitySyncStateInfo.proto
+++ b/proto/AbilitySyncStateInfo.proto
@@ -2,15 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+import "AbilityScalarValueEntry.proto";
import "AbilityAppliedAbility.proto";
import "AbilityAppliedModifier.proto";
import "AbilityMixinRecoverInfo.proto";
-import "AbilityScalarValueEntry.proto";
message AbilitySyncStateInfo {
- bool isInited = 1;
- repeated AbilityScalarValueEntry dynamicValueMap = 2;
- repeated AbilityAppliedAbility appliedAbilities = 3;
- repeated AbilityAppliedModifier appliedModifiers = 4;
- repeated AbilityMixinRecoverInfo mixinRecoverInfos = 5;
+ bool is_inited = 1;
+ repeated AbilityScalarValueEntry dynamic_value_map = 2;
+ repeated AbilityAppliedAbility applied_abilities = 3;
+ repeated AbilityAppliedModifier applied_modifiers = 4;
+ repeated AbilityMixinRecoverInfo mixin_recover_infos = 5;
+ repeated AbilityScalarValueEntry sgv_dynamic_value_map = 6;
}
diff --git a/proto/ActionReasonType.proto b/proto/ActionReasonType.proto
old mode 100644
new mode 100755
index 29f2639..8539e9a
--- a/proto/ActionReasonType.proto
+++ b/proto/ActionReasonType.proto
@@ -3,177 +3,209 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum ActionReasonType {
- ActionReasonNone = 0;
- ActionReasonQuestItem = 1;
- ActionReasonQuestReward = 2;
- ActionReasonTrifle = 3;
- ActionReasonShop = 4;
- ActionReasonPlayerUpgradeReward = 5;
- ActionReasonAddAvatar = 6;
- ActionReasonGadgetEnvAnimal = 7;
- ActionReasonMonsterEnvAnimal = 8;
- ActionReasonCompound = 9;
- ActionReasonCook = 10;
- ActionReasonGather = 11;
- ActionReasonMailAttachment = 12;
- ActionReasonCityLevelupReturn = 15;
- ActionReasonCityLevelupReward = 17;
- ActionReasonAreaExploreReward = 18;
- ActionReasonUnlockPointReward = 19;
- ActionReasonDungeonFirstPass = 20;
- ActionReasonDungeonPass = 21;
- ActionReasonChangeElemType = 23;
- ActionReasonFetterOpen = 25;
- ActionReasonDailyTaskScore = 26;
- ActionReasonDailyTaskHost = 27;
- ActionReasonRandTaskHost = 28;
- ActionReasonExpedition = 29;
- ActionReasonGacha = 30;
- ActionReasonCombine = 31;
- ActionReasonRandTaskGuest = 32;
- ActionReasonDailyTaskGuest = 33;
- ActionReasonForgeOutput = 34;
- ActionReasonForgeReturn = 35;
- ActionReasonInitAvatar = 36;
- ActionReasonMonsterDie = 37;
- ActionReasonGm = 38;
- ActionReasonOpenChest = 39;
- ActionReasonGadgetDie = 40;
- ActionReasonMonsterChangeHp = 41;
- ActionReasonSubfieldDrop = 42;
- ActionReasonPushTipsReward = 43;
- ActionReasonActivityMonsterDrop = 44;
- ActionReasonActivityGather = 45;
- ActionReasonActivitySubfieldDrop = 46;
- ActionReasonTowerScheduleReward = 47;
- ActionReasonTowerFloorStarReward = 48;
- ActionReasonTowerFirstPassReward = 49;
- ActionReasonTowerDailyReward = 50;
- ActionReasonHitClientTrivialEntity = 51;
- ActionReasonOpenWorldBossChest = 52;
- ActionReasonMaterialDeleteReturn = 53;
- ActionReasonSignInReward = 54;
- ActionReasonOpenBlossomChest = 55;
- ActionReasonRecharge = 56;
- ActionReasonBonusActivityReward = 57;
- ActionReasonTowerCommemorativeReward = 58;
- ActionReasonTowerSkipFloorReward = 59;
- ActionReasonRechargeBonus = 60;
- ActionReasonRechargeCard = 61;
- ActionReasonRechargeCardDaily = 62;
- ActionReasonRechargeCardReplace = 63;
- ActionReasonRechargeCardReplaceFree = 64;
- ActionReasonRechargePlayReplace = 65;
- ActionReasonMpPlayTakeReward = 66;
- ActionReasonActivityWatcher = 67;
- ActionReasonSalesmanDeliverItem = 68;
- ActionReasonSalesmanReward = 69;
- ActionReasonRebate = 70;
- ActionReasonMcoinExchangeHcoin = 71;
- ActionReasonDailyTaskExchangeLegendaryKey = 72;
- ActionReasonUnlockPersonLine = 73;
- ActionReasonFetterLevelReward = 74;
- ActionReasonBuyResin = 75;
- ActionReasonRechargePackage = 76;
- ActionReasonDeliveryDailyReward = 77;
- ActionReasonCityReputationLevel = 78;
- ActionReasonCityReputationQuest = 79;
- ActionReasonCityReputationRequest = 80;
- ActionReasonCityReputationExplore = 81;
- ActionReasonOffergingLevel = 82;
- ActionReasonRoutineHost = 83;
- ActionReasonRoutineGuest = 84;
- ActionReasonTreasureMapSpotToken = 89;
- ActionReasonTreasureMapBonusLevelReward = 90;
- ActionReasonTreasureMapMpReward = 91;
- ActionReasonConvert = 92;
- ActionReasonOverflowTransform = 93;
- ActionReasonActivityAvatarSelectionReward = 96;
- ActionReasonActivityWatcherBatch = 97;
- ActionReasonHitTreeDrop = 98;
- ActionReasonGetHomeLevelupReward = 99;
- ActionReasonHomeDefaultFurniture = 100;
- ActionReasonActivityCond = 101;
- ActionReasonBattlePassNotify = 102;
- ActionReasonPlayerUseItem = 1001;
- ActionReasonDropItem = 1002;
- ActionReasonWeaponUpgrade = 1011;
- ActionReasonWeaponPromote = 1012;
- ActionReasonWeaponAwaken = 1013;
- ActionReasonRelicUpgrade = 1014;
- ActionReasonAbility = 1015;
- ActionReasonDungeonStatueDrop = 1016;
- ActionReasonOfflineMsg = 1017;
- ActionReasonAvatarUpgrade = 1018;
- ActionReasonAvatarPromote = 1019;
- ActionReasonQuestAction = 1021;
- ActionReasonCityLevelup = 1022;
- ActionReasonUpgradeSkill = 1024;
- ActionReasonUnlockTalent = 1025;
- ActionReasonUpgradeProudSkill = 1026;
- ActionReasonPlayerLevelLimitUp = 1027;
- ActionReasonDungeonDaily = 1028;
- ActionReasonItemGiving = 1030;
- ActionReasonForgeCost = 1031;
- ActionReasonInvestigationReward = 1032;
- ActionReasonInvestigationTargetReward = 1033;
- ActionReasonGadgetInteract = 1034;
- ActionReasonSeaLampCiMaterial = 1036;
- ActionReasonSeaLampContributionReward = 1037;
- ActionReasonSeaLampPhaseReward = 1038;
- ActionReasonSeaLampFlyLamp = 1039;
- ActionReasonAutoRecover = 1040;
- ActionReasonActivityExpireItem = 1041;
- ActionReasonSubCoinNegative = 1042;
- ActionReasonBargainDeduct = 1043;
- ActionReasonBattlePassPaidReward = 1044;
- ActionReasonBattlePassLevelReward = 1045;
- ActionReasonTrialAvatarActivityFirstPassReward = 1046;
- ActionReasonBuyBattlePassLevel = 1047;
- ActionReasonGrantBirthdayBenefit = 1048;
- ActionReasonAchievementReward = 1049;
- ActionReasonAchievementGoalReward = 1050;
- ActionReasonFirstShareToSocialNetwork = 1051;
- ActionReasonDestroyMaterial = 1052;
- ActionReasonCodexLevelupReward = 1053;
- ActionReasonHuntingOfferReward = 1054;
- ActionReasonUseWidgetAnchorPoint = 1055;
- ActionReasonUseWidgetBonfire = 1056;
- ActionReasonUngradeWeaponReturnMaterial = 1057;
- ActionReasonUseWidgetOneoffGatherPointDetector = 1058;
- ActionReasonUseWidgetClientCollector = 1059;
- ActionReasonUseWidgetClientDetector = 1060;
- ActionReasonTakeGeneralReward = 1061;
- ActionReasonAsterTakeSpecialReward = 1062;
- ActionReasonRemoveCodexBook = 1063;
- ActionReasonOfferingItem = 1064;
- ActionReasonUseWidgetGadgetBuilder = 1065;
- ActionReasonEffigyFirstPassReward = 1066;
- ActionReasonEffigyReward = 1067;
- ActionReasonReunionFirstGiftReward = 1068;
- ActionReasonReunionSignInReward = 1069;
- ActionReasonReunionWatcherReward = 1070;
- ActionReasonSalesmanMpReward = 1071;
- ActionReasionAvatarPromoteReward = 1072;
- ActionReasonBlessingRedeemReward = 1073;
- ActionMiracleRingReward = 1074;
- ActionReasonExpeditionReward = 1075;
- ActionReasonTreasureMapRemoveDetector = 1076;
- ActionReasonMechanicusDungeonTicket = 1077;
- ActionReasonMechanicusLevelupGear = 1078;
- ActionReasonMechanicusBattleSettle = 1079;
- ActionReasonRegionSearchReward = 1080;
- ActionReasonUnlockCoopChapter = 1081;
- ActionReasonTakeCoopReward = 1082;
- ActionReasonFleurFairDungeonReward = 1083;
- ActionReasonActivityScore = 1084;
- ActionReasonChannellerSlabOneoffDungeonReward = 1085;
- ActionReasonFurnitureMakeStart = 1086;
- ActionReasonFurnitureMakeTake = 1087;
- ActionReasonFurnitureMakeCancel = 1088;
- ActionReasonFurnitureMakeFastFinish = 1089;
- ActionReasonChannellerSlabLoopDungeonFirstPassReward = 1090;
- ActionReasonChannellerSlabLoopDungeonScoreReward = 1091;
- ActionReasonHomeLimitedShopBuy = 1092;
- ActionReasonHomeCoinCollect = 1093;
+ ACTION_REASON_NONE = 0;
+ ACTION_REASON_QUEST_ITEM = 1;
+ ACTION_REASON_QUEST_REWARD = 2;
+ ACTION_REASON_TRIFLE = 3;
+ ACTION_REASON_SHOP = 4;
+ ACTION_REASON_PLAYER_UPGRADE_REWARD = 5;
+ ACTION_REASON_ADD_AVATAR = 6;
+ ACTION_REASON_GADGET_ENV_ANIMAL = 7;
+ ACTION_REASON_MONSTER_ENV_ANIMAL = 8;
+ ACTION_REASON_COMPOUND = 9;
+ ACTION_REASON_COOK = 10;
+ ACTION_REASON_GATHER = 11;
+ ACTION_REASON_MAIL_ATTACHMENT = 12;
+ ACTION_REASON_CITY_LEVELUP_RETURN = 15;
+ ACTION_REASON_CITY_LEVELUP_REWARD = 17;
+ ACTION_REASON_AREA_EXPLORE_REWARD = 18;
+ ACTION_REASON_UNLOCK_POINT_REWARD = 19;
+ ACTION_REASON_DUNGEON_FIRST_PASS = 20;
+ ACTION_REASON_DUNGEON_PASS = 21;
+ ACTION_REASON_CHANGE_ELEM_TYPE = 23;
+ ACTION_REASON_FETTER_OPEN = 25;
+ ACTION_REASON_DAILY_TASK_SCORE = 26;
+ ACTION_REASON_DAILY_TASK_HOST = 27;
+ ACTION_REASON_RAND_TASK_HOST = 28;
+ ACTION_REASON_EXPEDITION = 29;
+ ACTION_REASON_GACHA = 30;
+ ACTION_REASON_COMBINE = 31;
+ ACTION_REASON_RAND_TASK_GUEST = 32;
+ ACTION_REASON_DAILY_TASK_GUEST = 33;
+ ACTION_REASON_FORGE_OUTPUT = 34;
+ ACTION_REASON_FORGE_RETURN = 35;
+ ACTION_REASON_INIT_AVATAR = 36;
+ ACTION_REASON_MONSTER_DIE = 37;
+ ACTION_REASON_GM = 38;
+ ACTION_REASON_OPEN_CHEST = 39;
+ ACTION_REASON_GADGET_DIE = 40;
+ ACTION_REASON_MONSTER_CHANGE_HP = 41;
+ ACTION_REASON_SUBFIELD_DROP = 42;
+ ACTION_REASON_PUSH_TIPS_REWARD = 43;
+ ACTION_REASON_ACTIVITY_MONSTER_DROP = 44;
+ ACTION_REASON_ACTIVITY_GATHER = 45;
+ ACTION_REASON_ACTIVITY_SUBFIELD_DROP = 46;
+ ACTION_REASON_TOWER_SCHEDULE_REWARD = 47;
+ ACTION_REASON_TOWER_FLOOR_STAR_REWARD = 48;
+ ACTION_REASON_TOWER_FIRST_PASS_REWARD = 49;
+ ACTION_REASON_TOWER_DAILY_REWARD = 50;
+ ACTION_REASON_HIT_CLIENT_TRIVIAL_ENTITY = 51;
+ ACTION_REASON_OPEN_WORLD_BOSS_CHEST = 52;
+ ACTION_REASON_MATERIAL_DELETE_RETURN = 53;
+ ACTION_REASON_SIGN_IN_REWARD = 54;
+ ACTION_REASON_OPEN_BLOSSOM_CHEST = 55;
+ ACTION_REASON_RECHARGE = 56;
+ ACTION_REASON_BONUS_ACTIVITY_REWARD = 57;
+ ACTION_REASON_TOWER_COMMEMORATIVE_REWARD = 58;
+ ACTION_REASON_TOWER_SKIP_FLOOR_REWARD = 59;
+ ACTION_REASON_RECHARGE_BONUS = 60;
+ ACTION_REASON_RECHARGE_CARD = 61;
+ ACTION_REASON_RECHARGE_CARD_DAILY = 62;
+ ACTION_REASON_RECHARGE_CARD_REPLACE = 63;
+ ACTION_REASON_RECHARGE_CARD_REPLACE_FREE = 64;
+ ACTION_REASON_RECHARGE_PLAY_REPLACE = 65;
+ ACTION_REASON_MP_PLAY_TAKE_REWARD = 66;
+ ACTION_REASON_ACTIVITY_WATCHER = 67;
+ ACTION_REASON_SALESMAN_DELIVER_ITEM = 68;
+ ACTION_REASON_SALESMAN_REWARD = 69;
+ ACTION_REASON_REBATE = 70;
+ ACTION_REASON_MCOIN_EXCHANGE_HCOIN = 71;
+ ACTION_REASON_DAILY_TASK_EXCHANGE_LEGENDARY_KEY = 72;
+ ACTION_REASON_UNLOCK_PERSON_LINE = 73;
+ ACTION_REASON_FETTER_LEVEL_REWARD = 74;
+ ACTION_REASON_BUY_RESIN = 75;
+ ACTION_REASON_RECHARGE_PACKAGE = 76;
+ ACTION_REASON_DELIVERY_DAILY_REWARD = 77;
+ ACTION_REASON_CITY_REPUTATION_LEVEL = 78;
+ ACTION_REASON_CITY_REPUTATION_QUEST = 79;
+ ACTION_REASON_CITY_REPUTATION_REQUEST = 80;
+ ACTION_REASON_CITY_REPUTATION_EXPLORE = 81;
+ ACTION_REASON_OFFERGING_LEVEL = 82;
+ ACTION_REASON_ROUTINE_HOST = 83;
+ ACTION_REASON_ROUTINE_GUEST = 84;
+ ACTION_REASON_TREASURE_MAP_SPOT_TOKEN = 89;
+ ACTION_REASON_TREASURE_MAP_BONUS_LEVEL_REWARD = 90;
+ ACTION_REASON_TREASURE_MAP_MP_REWARD = 91;
+ ACTION_REASON_CONVERT = 92;
+ ACTION_REASON_OVERFLOW_TRANSFORM = 93;
+ ACTION_REASON_ACTIVITY_AVATAR_SELECTION_REWARD = 96;
+ ACTION_REASON_ACTIVITY_WATCHER_BATCH = 97;
+ ACTION_REASON_HIT_TREE_DROP = 98;
+ ACTION_REASON_GET_HOME_LEVELUP_REWARD = 99;
+ ACTION_REASON_HOME_DEFAULT_FURNITURE = 100;
+ ACTION_REASON_ACTIVITY_COND = 101;
+ ACTION_REASON_BATTLE_PASS_NOTIFY = 102;
+ ACTION_REASON_RELIQUARY_DECOMPOSE = 103;
+ ACTION_REASON_RECHARGE_GOOGLE_GIFT_GARD = 104;
+ ACTION_REASON_RECHARGE_CONCERT_PRODUCT = 105;
+ ACTION_REASON_RECHARGE_CONCERT_PRODUCT_REPLACE = 106;
+ ACTION_REASON_SEND_CONCERT_PRODUCT_BY_MUIP = 107;
+ ACTION_REASON_RECHARGE_APPLE_GIFT_GARD = 108;
+ ACTION_REASON_PLAYER_USE_ITEM = 1001;
+ ACTION_REASON_DROP_ITEM = 1002;
+ ACTION_REASON_WEAPON_UPGRADE = 1011;
+ ACTION_REASON_WEAPON_PROMOTE = 1012;
+ ACTION_REASON_WEAPON_AWAKEN = 1013;
+ ACTION_REASON_RELIC_UPGRADE = 1014;
+ ACTION_REASON_ABILITY = 1015;
+ ACTION_REASON_DUNGEON_STATUE_DROP = 1016;
+ ACTION_REASON_OFFLINE_MSG = 1017;
+ ACTION_REASON_AVATAR_UPGRADE = 1018;
+ ACTION_REASON_AVATAR_PROMOTE = 1019;
+ ACTION_REASON_QUEST_ACTION = 1021;
+ ACTION_REASON_CITY_LEVELUP = 1022;
+ ACTION_REASON_UPGRADE_SKILL = 1024;
+ ACTION_REASON_UNLOCK_TALENT = 1025;
+ ACTION_REASON_UPGRADE_PROUD_SKILL = 1026;
+ ACTION_REASON_PLAYER_LEVEL_LIMIT_UP = 1027;
+ ACTION_REASON_DUNGEON_DAILY = 1028;
+ ACTION_REASON_ITEM_GIVING = 1030;
+ ACTION_REASON_FORGE_COST = 1031;
+ ACTION_REASON_INVESTIGATION_REWARD = 1032;
+ ACTION_REASON_INVESTIGATION_TARGET_REWARD = 1033;
+ ACTION_REASON_GADGET_INTERACT = 1034;
+ ACTION_REASON_SEA_LAMP_CI_MATERIAL = 1036;
+ ACTION_REASON_SEA_LAMP_CONTRIBUTION_REWARD = 1037;
+ ACTION_REASON_SEA_LAMP_PHASE_REWARD = 1038;
+ ACTION_REASON_SEA_LAMP_FLY_LAMP = 1039;
+ ACTION_REASON_AUTO_RECOVER = 1040;
+ ACTION_REASON_ACTIVITY_EXPIRE_ITEM = 1041;
+ ACTION_REASON_SUB_COIN_NEGATIVE = 1042;
+ ACTION_REASON_BARGAIN_DEDUCT = 1043;
+ ACTION_REASON_BATTLE_PASS_PAID_REWARD = 1044;
+ ACTION_REASON_BATTLE_PASS_LEVEL_REWARD = 1045;
+ ACTION_REASON_TRIAL_AVATAR_ACTIVITY_FIRST_PASS_REWARD = 1046;
+ ACTION_REASON_BUY_BATTLE_PASS_LEVEL = 1047;
+ ACTION_REASON_GRANT_BIRTHDAY_BENEFIT = 1048;
+ ACTION_REASON_ACHIEVEMENT_REWARD = 1049;
+ ACTION_REASON_ACHIEVEMENT_GOAL_REWARD = 1050;
+ ACTION_REASON_FIRST_SHARE_TO_SOCIAL_NETWORK = 1051;
+ ACTION_REASON_DESTROY_MATERIAL = 1052;
+ ACTION_REASON_CODEX_LEVELUP_REWARD = 1053;
+ ACTION_REASON_HUNTING_OFFER_REWARD = 1054;
+ ACTION_REASON_USE_WIDGET_ANCHOR_POINT = 1055;
+ ACTION_REASON_USE_WIDGET_BONFIRE = 1056;
+ ACTION_REASON_UNGRADE_WEAPON_RETURN_MATERIAL = 1057;
+ ACTION_REASON_USE_WIDGET_ONEOFF_GATHER_POINT_DETECTOR = 1058;
+ ACTION_REASON_USE_WIDGET_CLIENT_COLLECTOR = 1059;
+ ACTION_REASON_USE_WIDGET_CLIENT_DETECTOR = 1060;
+ ACTION_REASON_TAKE_GENERAL_REWARD = 1061;
+ ACTION_REASON_ASTER_TAKE_SPECIAL_REWARD = 1062;
+ ACTION_REASON_REMOVE_CODEX_BOOK = 1063;
+ ACTION_REASON_OFFERING_ITEM = 1064;
+ ACTION_REASON_USE_WIDGET_GADGET_BUILDER = 1065;
+ ACTION_REASON_EFFIGY_FIRST_PASS_REWARD = 1066;
+ ACTION_REASON_EFFIGY_REWARD = 1067;
+ ACTION_REASON_REUNION_FIRST_GIFT_REWARD = 1068;
+ ACTION_REASON_REUNION_SIGN_IN_REWARD = 1069;
+ ACTION_REASON_REUNION_WATCHER_REWARD = 1070;
+ ACTION_REASON_SALESMAN_MP_REWARD = 1071;
+ ACTION_REASION_AVATAR_PROMOTE_REWARD = 1072;
+ ACTION_REASON_BLESSING_REDEEM_REWARD = 1073;
+ ACTION_MIRACLE_RING_REWARD = 1074;
+ ACTION_REASON_EXPEDITION_REWARD = 1075;
+ ACTION_REASON_TREASURE_MAP_REMOVE_DETECTOR = 1076;
+ ACTION_REASON_MECHANICUS_DUNGEON_TICKET = 1077;
+ ACTION_REASON_MECHANICUS_LEVELUP_GEAR = 1078;
+ ACTION_REASON_MECHANICUS_BATTLE_SETTLE = 1079;
+ ACTION_REASON_REGION_SEARCH_REWARD = 1080;
+ ACTION_REASON_UNLOCK_COOP_CHAPTER = 1081;
+ ACTION_REASON_TAKE_COOP_REWARD = 1082;
+ ACTION_REASON_FLEUR_FAIR_DUNGEON_REWARD = 1083;
+ ACTION_REASON_ACTIVITY_SCORE = 1084;
+ ACTION_REASON_CHANNELLER_SLAB_ONEOFF_DUNGEON_REWARD = 1085;
+ ACTION_REASON_FURNITURE_MAKE_START = 1086;
+ ACTION_REASON_FURNITURE_MAKE_TAKE = 1087;
+ ACTION_REASON_FURNITURE_MAKE_CANCEL = 1088;
+ ACTION_REASON_FURNITURE_MAKE_FAST_FINISH = 1089;
+ ACTION_REASON_CHANNELLER_SLAB_LOOP_DUNGEON_FIRST_PASS_REWARD = 1090;
+ ACTION_REASON_CHANNELLER_SLAB_LOOP_DUNGEON_SCORE_REWARD = 1091;
+ ACTION_REASON_HOME_LIMITED_SHOP_BUY = 1092;
+ ACTION_REASON_HOME_COIN_COLLECT = 1093;
+ ACTION_REASON_SUMMER_TIME_SENTRY_TOWER_REWARD = 1094;
+ ACTION_REASON_SUMMER_TIME_SPRINT_BOAT_REWARD = 1095;
+ ACTION_REASON_SUMMER_TIME_BOSS_REWARD = 1096;
+ ACTION_REASON_SUMMER_TIME_BOMB_REWARD = 1097;
+ ACTION_REASON_HOME_FETTER_COLLECT = 1098;
+ ACTION_REASON_ECHO_SHELL_REWARD = 1099;
+ ACTION_REASON_HOME_EVENT_REWARD = 1100;
+ ACTION_REASON_BLITZ_RUSH_DUNGEON_REWARD = 1101;
+ ACTION_REASON_FURNITURE_MAKE_RETURN = 1102;
+ ACTION_REASON_HOME_PLANT_BOX_GATHER = 1103;
+ ACTION_REASON_HOME_PLANT_SEED = 1104;
+ ACTION_REASON_HOME_PLANT_GATHER = 1105;
+ ACTION_REASON_CHESS_DUNGEON_REWARD = 1106;
+ ACTION_REASON_GROUP_LINK_BUNDLE_FINISH = 1107;
+ ACTION_REASON_LUNA_RITE_SACRIFICE = 1108;
+ ACTION_REASON_LUNA_RITE_TAKE_SACRIFICE_REWARD = 1109;
+ ACTION_REASON_FISH_BITE = 1110;
+ ACTION_REASON_FISH_SUCC = 1111;
+ ACTION_REASON_PLANT_FLOWER_REWARD = 1112;
+ ACTION_REASON_PLANT_FLOWER_DELIVER_ITEM = 1113;
+ ACTION_REASON_PLANT_FLOWER_GIVE_FLOWER = 1114;
+ ACTION_REASON_PLANT_FLOWER_RECV_FLOWER = 1115;
+ ACTION_REASON_ROGUE_CHALLENGE_SETTLE = 1116;
+ ACTION_REASON_ROGUE_TAKE_FIRST_PASS_REWARD = 1117;
+ ACTION_REASON_ROGUE_UPGRADE_SHIKIGAMI = 1118;
+ ACTION_REASON_ROGUE_REFRESH_CARD = 1119;
}
diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto
old mode 100644
new mode 100755
index 836f7d1..373c8e2
--- a/proto/ActivityInfo.proto
+++ b/proto/ActivityInfo.proto
@@ -6,42 +6,57 @@ import "ActivityNullDetailInfo.proto";
import "ActivityWatcherInfo.proto";
message ActivityInfo {
- uint32 activityId = 1;
- uint32 scheduleId = 2;
- uint32 beginTime = 3;
- uint32 endTime = 4;
- uint32 activityType = 5;
- bool isPlayOpenAnim = 6;
- bool isFinished = 7;
- bool isStarting = 8;
- repeated ActivityWatcherInfo watcherInfoList = 9;
- repeated uint32 meetCondList = 10;
- repeated uint32 expireCondList = 15;
- uint32 selectedAvatarRewardId = 17;
- map activityCoinMap = 18;
- uint32 scoreLimit = 19;
- uint32 curScore = 20;
- repeated uint32 takenRewardList = 24;
- oneof detail {
- ActivityNullDetailInfo samLampInfo = 11;
- ActivityNullDetailInfo crucibleInfo = 12;
- ActivityNullDetailInfo salesmanInfo = 13;
- ActivityNullDetailInfo trialAvatarInfo = 14;
- ActivityNullDetailInfo deliveryInfo = 16;
- ActivityNullDetailInfo asterInfo = 21;
- ActivityNullDetailInfo flightInfo = 25;
- ActivityNullDetailInfo dragonSpineInfo = 31;
- ActivityNullDetailInfo effigyInfo = 32;
- ActivityNullDetailInfo treasureMapInfo = 35;
- ActivityNullDetailInfo blessingInfo = 41;
- ActivityNullDetailInfo seaLampInfo = 42;
- ActivityNullDetailInfo expeditionInfo = 43;
- ActivityNullDetailInfo arenaChallengeInfo = 44;
- ActivityNullDetailInfo fleurFairInfo = 51;
- ActivityNullDetailInfo waterSpiritInfo = 52;
- ActivityNullDetailInfo challnelerSlabInfo = 61;
- ActivityNullDetailInfo mistTrialActivityInfo = 62;
- ActivityNullDetailInfo hideAndSeekInfo = 63;
- ActivityNullDetailInfo findHilichurlInfo = 64;
+ oneof Detail {
+ ActivityNullDetailInfo sam_lamp_info = 11;
+ ActivityNullDetailInfo crucible_info = 12;
+ ActivityNullDetailInfo salesman_info = 13;
+ ActivityNullDetailInfo trial_avatar_info = 14;
+ ActivityNullDetailInfo delivery_info = 16;
+ ActivityNullDetailInfo aster_info = 21;
+ ActivityNullDetailInfo flight_info = 25;
+ ActivityNullDetailInfo dragon_spine_info = 31;
+ ActivityNullDetailInfo effigy_info = 32;
+ ActivityNullDetailInfo treasure_map_info = 35;
+ ActivityNullDetailInfo blessing_info = 41;
+ ActivityNullDetailInfo sea_lamp_info = 42;
+ ActivityNullDetailInfo expedition_info = 43;
+ ActivityNullDetailInfo arena_challenge_info = 44;
+ ActivityNullDetailInfo fleur_fair_info = 51;
+ ActivityNullDetailInfo water_spirit_info = 52;
+ ActivityNullDetailInfo challneler_slab_info = 61;
+ ActivityNullDetailInfo mist_trial_activity_info = 62;
+ ActivityNullDetailInfo hide_and_seek_info = 63;
+ ActivityNullDetailInfo find_hilichurl_info = 64;
+ ActivityNullDetailInfo summer_time_info = 65;
+ ActivityNullDetailInfo buoyant_combat_info = 66;
+ ActivityNullDetailInfo echo_shell_info = 67;
+ ActivityNullDetailInfo bounce_conjuring_info = 68;
+ ActivityNullDetailInfo blitz_rush_info = 69;
+ ActivityNullDetailInfo chess_info = 70;
+ ActivityNullDetailInfo sumo_info = 71;
+ ActivityNullDetailInfo moonfin_trial_info = 72;
+ ActivityNullDetailInfo luna_rite_info = 73;
+ ActivityNullDetailInfo plant_flower_info = 74;
+ ActivityNullDetailInfo music_game_info = 75;
+ ActivityNullDetailInfo roguelike_dungoen_info = 76;
+ ActivityNullDetailInfo dig_info = 77;
}
+ uint32 activity_id = 1;
+ uint32 schedule_id = 2;
+ uint32 begin_time = 3;
+ uint32 end_time = 4;
+ uint32 activity_type = 5;
+ bool is_play_open_anim = 6;
+ bool is_finished = 7;
+ bool is_starting = 8;
+ repeated ActivityWatcherInfo watcher_info_list = 9;
+ repeated uint32 meet_cond_list = 10;
+ repeated uint32 expire_cond_list = 15;
+ uint32 selected_avatar_reward_id = 17;
+ map activity_coin_map = 18;
+ uint32 score_limit = 19;
+ uint32 cur_score = 20;
+ repeated uint32 taken_reward_list = 24;
+ bool is_hidden = 26;
+ uint32 first_day_start_time = 27;
}
diff --git a/proto/ActivityNullDetailInfo.proto b/proto/ActivityNullDetailInfo.proto
old mode 100644
new mode 100755
diff --git a/proto/ActivityWatcherInfo.proto b/proto/ActivityWatcherInfo.proto
old mode 100644
new mode 100755
index eb4e005..fa82861
--- a/proto/ActivityWatcherInfo.proto
+++ b/proto/ActivityWatcherInfo.proto
@@ -2,9 +2,10 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ActivityWatcherInfo {
- uint32 watcherId = 1;
- uint32 curProgress = 2;
- uint32 totalProgress = 3;
- bool isTakenReward = 4;
+ uint32 watcher_id = 1;
+ uint32 cur_progress = 2;
+ uint32 total_progress = 3;
+ bool is_taken_reward = 4;
}
diff --git a/proto/AdjustTrackingInfo.proto b/proto/AdjustTrackingInfo.proto
new file mode 100644
index 0000000..06c41ea
--- /dev/null
+++ b/proto/AdjustTrackingInfo.proto
@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message AdjustTrackingInfo {
+ string idfa = 1;
+ string gps_adid = 2;
+ string fire_adid = 3;
+ string adid = 4;
+ string event_token = 5;
+ string app_token = 6;
+}
diff --git a/proto/AiSkillCdInfo.proto b/proto/AiSkillCdInfo.proto
old mode 100644
new mode 100755
index ad5f072..e0e2057
--- a/proto/AiSkillCdInfo.proto
+++ b/proto/AiSkillCdInfo.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AiSkillCdInfo {
- map skillCdMap = 1;
- map skillGroupCdMap = 2;
+ map skill_cd_map = 1;
+ map skill_group_cd_map = 2;
}
diff --git a/proto/AiSyncInfo.proto b/proto/AiSyncInfo.proto
old mode 100644
new mode 100755
index 1dc25b8..b279f20
--- a/proto/AiSyncInfo.proto
+++ b/proto/AiSyncInfo.proto
@@ -2,7 +2,9 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AiSyncInfo {
- uint32 entityId = 1;
- bool hasPathToTarget = 2;
+ uint32 entity_id = 1;
+ bool has_path_to_target = 2;
+ bool is_self_killing = 3;
}
diff --git a/proto/AiThreatInfo.proto b/proto/AiThreatInfo.proto
old mode 100644
new mode 100755
index eb4ceeb..24e2083
--- a/proto/AiThreatInfo.proto
+++ b/proto/AiThreatInfo.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AiThreatInfo {
- map aiThreatMap = 1;
+ map ai_threat_map = 1;
}
diff --git a/proto/AnimatorParameterValueInfo.proto b/proto/AnimatorParameterValueInfo.proto
old mode 100644
new mode 100755
index 0735f51..fd74b7e
--- a/proto/AnimatorParameterValueInfo.proto
+++ b/proto/AnimatorParameterValueInfo.proto
@@ -2,9 +2,12 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AnimatorParameterValueInfo {
- uint32 paraType = 1;
- int32 intVal = 2;
- float floatVal = 3;
- bool boolVal = 4;
+ oneof ParaVal {
+ int32 int_val = 2;
+ float float_val = 3;
+ bool bool_val = 4;
+ }
+ uint32 para_type = 1;
}
diff --git a/proto/AnimatorParameterValueInfoPair.proto b/proto/AnimatorParameterValueInfoPair.proto
old mode 100644
new mode 100755
index 1ead0b9..c0e7757
--- a/proto/AnimatorParameterValueInfoPair.proto
+++ b/proto/AnimatorParameterValueInfoPair.proto
@@ -5,6 +5,6 @@ option java_package = "emu.grasscutter.net.proto";
import "AnimatorParameterValueInfo.proto";
message AnimatorParameterValueInfoPair {
- int32 name = 1;
- AnimatorParameterValueInfo animatorPara = 2;
+ int32 name_id = 1;
+ AnimatorParameterValueInfo animator_para = 2;
}
diff --git a/proto/AskAddFriendNotify.proto b/proto/AskAddFriendNotify.proto
old mode 100644
new mode 100755
index ab5f6ef..647ca56
--- a/proto/AskAddFriendNotify.proto
+++ b/proto/AskAddFriendNotify.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "FriendBrief.proto";
message AskAddFriendNotify {
- uint32 targetUid = 1;
- FriendBrief targetFriendBrief = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 4006;
+ }
+
+ uint32 target_uid = 1;
+ FriendBrief target_friend_brief = 2;
}
diff --git a/proto/AskAddFriendReq.proto b/proto/AskAddFriendReq.proto
old mode 100644
new mode 100755
index ac8a908..65c89ea
--- a/proto/AskAddFriendReq.proto
+++ b/proto/AskAddFriendReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AskAddFriendReq {
- uint32 targetUid = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 4100;
+ }
+
+ uint32 target_uid = 1;
}
diff --git a/proto/AskAddFriendRsp.proto b/proto/AskAddFriendRsp.proto
old mode 100644
new mode 100755
index 4893ea2..12493c5
--- a/proto/AskAddFriendRsp.proto
+++ b/proto/AskAddFriendRsp.proto
@@ -2,8 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AskAddFriendRsp {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 4001;
+ }
+
int32 retcode = 1;
- uint32 targetUid = 2;
+ uint32 target_uid = 2;
uint32 param = 3;
}
diff --git a/proto/AttackHitEffectResult.proto b/proto/AttackHitEffectResult.proto
old mode 100644
new mode 100755
index d997b7a..b3e0ec3
--- a/proto/AttackHitEffectResult.proto
+++ b/proto/AttackHitEffectResult.proto
@@ -2,11 +2,12 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AttackHitEffectResult {
- uint32 hitEffLevel = 1;
- float retreatStrength = 2;
- float airStrength = 3;
- float hitHaltTime = 4;
- float hitHaltTimeScale = 5;
- uint32 originalHitEffLevel = 6;
+ uint32 hit_eff_level = 1;
+ float retreat_strength = 2;
+ float air_strength = 3;
+ float hit_halt_time = 4;
+ float hit_halt_time_scale = 5;
+ uint32 original_hit_eff_level = 6;
}
diff --git a/proto/AttackResult.proto b/proto/AttackResult.proto
old mode 100644
new mode 100755
index 9b14987..6b55dd5
--- a/proto/AttackResult.proto
+++ b/proto/AttackResult.proto
@@ -3,38 +3,38 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AbilityIdentifier.proto";
-import "AttackHitEffectResult.proto";
import "HitCollision.proto";
import "Vector.proto";
+import "AttackHitEffectResult.proto";
message AttackResult {
- uint32 attackerId = 1;
- uint32 defenseId = 2;
- string animEventId = 3;
- AbilityIdentifier abilityIdentifier = 4;
+ uint32 attacker_id = 1;
+ uint32 defense_id = 2;
+ string anim_event_id = 3;
+ AbilityIdentifier ability_identifier = 4;
float damage = 6;
- bool isCrit = 7;
- HitCollision hitCollision = 8;
- uint32 hitPosType = 9;
- uint32 endureBreak = 10;
- Vector resolvedDir = 11;
- int32 hitRetreatAngleCompat = 12;
- AttackHitEffectResult hitEffResult = 13;
- uint32 elementType = 14;
- bool useGadgetDamageAction = 19;
- uint32 gadgetDamageActionIdx = 20;
- bool isResistText = 22;
- uint32 criticalRand = 23;
- float elementAmplifyRate = 24;
- float damageShield = 26;
- bool muteElementHurt = 27;
- uint32 amplifyReactionType = 30;
- uint32 addhurtReactionType = 31;
- uint32 bulletFlyTimeMs = 32;
- uint32 attackCount = 33;
- uint32 hashedAnimEventId = 34;
- uint32 attackTimestampMs = 36;
- float endureDelta = 37;
- uint32 targetType = 38;
- float elementDurabilityAttenuation = 39;
+ bool is_crit = 7;
+ HitCollision hit_collision = 8;
+ uint32 hit_pos_type = 9;
+ uint32 endure_break = 10;
+ Vector resolved_dir = 11;
+ int32 hit_retreat_angle_compat = 12;
+ AttackHitEffectResult hit_eff_result = 13;
+ uint32 element_type = 14;
+ bool use_gadget_damage_action = 19;
+ uint32 gadget_damage_action_idx = 20;
+ bool is_resist_text = 22;
+ uint32 critical_rand = 23;
+ float element_amplify_rate = 24;
+ float damage_shield = 26;
+ bool mute_element_hurt = 27;
+ uint32 amplify_reaction_type = 30;
+ uint32 addhurt_reaction_type = 31;
+ uint32 bullet_fly_time_ms = 32;
+ uint32 attack_count = 33;
+ uint32 hashed_anim_event_id = 34;
+ uint32 attack_timestamp_ms = 36;
+ float endure_delta = 37;
+ uint32 target_type = 38;
+ float element_durability_attenuation = 39;
}
diff --git a/proto/AvatarAddNotify.proto b/proto/AvatarAddNotify.proto
old mode 100644
new mode 100755
index 1bbd17d..72375aa
--- a/proto/AvatarAddNotify.proto
+++ b/proto/AvatarAddNotify.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "AvatarInfo.proto";
message AvatarAddNotify {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1795;
+ }
+
AvatarInfo avatar = 1;
- bool isInTeam = 2;
+ bool is_in_team = 2;
}
diff --git a/proto/AvatarChangeCostumeNotify.proto b/proto/AvatarChangeCostumeNotify.proto
old mode 100644
new mode 100755
index 86a64ad..cb4c611
--- a/proto/AvatarChangeCostumeNotify.proto
+++ b/proto/AvatarChangeCostumeNotify.proto
@@ -5,5 +5,13 @@ option java_package = "emu.grasscutter.net.proto";
import "SceneEntityInfo.proto";
message AvatarChangeCostumeNotify {
- SceneEntityInfo entity = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1724;
+ }
+
+ SceneEntityInfo entity_info = 1;
}
diff --git a/proto/AvatarChangeCostumeReq.proto b/proto/AvatarChangeCostumeReq.proto
old mode 100644
new mode 100755
index 6a83f94..5da0ffd
--- a/proto/AvatarChangeCostumeReq.proto
+++ b/proto/AvatarChangeCostumeReq.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarChangeCostumeReq {
- uint64 avatarGuid = 1;
- uint32 costumeId = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1606;
+ }
+
+ uint64 avatar_guid = 1;
+ uint32 costume_id = 2;
}
diff --git a/proto/AvatarChangeCostumeRsp.proto b/proto/AvatarChangeCostumeRsp.proto
old mode 100644
new mode 100755
index a5a3490..e4e60bc
--- a/proto/AvatarChangeCostumeRsp.proto
+++ b/proto/AvatarChangeCostumeRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarChangeCostumeRsp {
- uint32 retcode = 1;
- uint64 avatarGuid = 2;
- uint32 costumeId = 3;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1748;
+ }
+
+ int32 retcode = 1;
+ uint64 avatar_guid = 2;
+ uint32 costume_id = 3;
}
diff --git a/proto/AvatarDataNotify.proto b/proto/AvatarDataNotify.proto
old mode 100644
new mode 100755
index 356d972..8f0a514
--- a/proto/AvatarDataNotify.proto
+++ b/proto/AvatarDataNotify.proto
@@ -6,11 +6,19 @@ import "AvatarInfo.proto";
import "AvatarTeam.proto";
message AvatarDataNotify {
- repeated AvatarInfo avatarList = 1;
- map avatarTeamMap = 2;
- uint32 curAvatarTeamId = 3;
- fixed64 chooseAvatarGuid = 4;
- repeated uint64 tempAvatarGuidList = 5;
- repeated uint32 ownedFlycloakList = 6;
- repeated uint32 ownedCostumeList = 7;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1694;
+ }
+
+ repeated AvatarInfo avatar_list = 1;
+ map avatar_team_map = 2;
+ uint32 cur_avatar_team_id = 3;
+ uint64 choose_avatar_guid = 4;
+ repeated uint64 temp_avatar_guid_list = 5;
+ repeated uint32 owned_flycloak_list = 6;
+ repeated uint32 owned_costume_list = 7;
}
diff --git a/proto/AvatarDieAnimationEndReq.proto b/proto/AvatarDieAnimationEndReq.proto
old mode 100644
new mode 100755
index 06bb7b3..de301fc
--- a/proto/AvatarDieAnimationEndReq.proto
+++ b/proto/AvatarDieAnimationEndReq.proto
@@ -5,7 +5,16 @@ option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
message AvatarDieAnimationEndReq {
- uint64 dieGuid = 1;
- uint32 skillId = 2;
- Vector rebornPos = 3;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1737;
+ }
+
+ uint64 die_guid = 1;
+ uint32 skill_id = 2;
+ Vector reborn_pos = 3;
}
diff --git a/proto/AvatarDieAnimationEndRsp.proto b/proto/AvatarDieAnimationEndRsp.proto
old mode 100644
new mode 100755
index ac0f1ea..58c9ecb
--- a/proto/AvatarDieAnimationEndRsp.proto
+++ b/proto/AvatarDieAnimationEndRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarDieAnimationEndRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1697;
+ }
+
int32 retcode = 1;
- uint64 dieGuid = 2;
- uint32 skillId = 3;
+ uint64 die_guid = 2;
+ uint32 skill_id = 3;
}
diff --git a/proto/AvatarEnterSceneInfo.proto b/proto/AvatarEnterSceneInfo.proto
old mode 100644
new mode 100755
index c4f15d5..448ddb9
--- a/proto/AvatarEnterSceneInfo.proto
+++ b/proto/AvatarEnterSceneInfo.proto
@@ -6,12 +6,12 @@ import "AbilitySyncStateInfo.proto";
import "ServerBuff.proto";
message AvatarEnterSceneInfo {
- uint64 avatarGuid = 1;
- uint32 avatarEntityId = 2;
- AbilitySyncStateInfo avatarAbilityInfo = 3;
- repeated uint32 buffIdList = 4;
- uint64 weaponGuid = 5;
- uint32 weaponEntityId = 6;
- AbilitySyncStateInfo weaponAbilityInfo = 7;
- repeated ServerBuff serverBuffList = 8;
+ uint64 avatar_guid = 1;
+ uint32 avatar_entity_id = 2;
+ AbilitySyncStateInfo avatar_ability_info = 3;
+ repeated uint32 buff_id_list = 4;
+ uint64 weapon_guid = 5;
+ uint32 weapon_entity_id = 6;
+ AbilitySyncStateInfo weapon_ability_info = 7;
+ repeated ServerBuff server_buff_list = 8;
}
diff --git a/proto/AvatarEquipAffixInfo.proto b/proto/AvatarEquipAffixInfo.proto
old mode 100644
new mode 100755
index 7e05f57..ef4a49f
--- a/proto/AvatarEquipAffixInfo.proto
+++ b/proto/AvatarEquipAffixInfo.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarEquipAffixInfo {
- uint32 equipAffixId = 1;
- uint32 leftCdTime = 2;
+ uint32 equip_affix_id = 1;
+ uint32 left_cd_time = 2;
}
diff --git a/proto/AvatarEquipChangeNotify.proto b/proto/AvatarEquipChangeNotify.proto
old mode 100644
new mode 100755
index bc6532f..c69c73f
--- a/proto/AvatarEquipChangeNotify.proto
+++ b/proto/AvatarEquipChangeNotify.proto
@@ -2,14 +2,23 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "SceneReliquaryInfo.proto";
import "SceneWeaponInfo.proto";
+import "SceneReliquaryInfo.proto";
message AvatarEquipChangeNotify {
- uint64 avatarGuid = 1;
- uint32 equipType = 2;
- uint32 itemId = 3;
- uint64 equipGuid = 4;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 615;
+ }
+
+ uint64 avatar_guid = 1;
+ uint32 equip_type = 2;
+ uint32 item_id = 3;
+ uint64 equip_guid = 4;
SceneWeaponInfo weapon = 5;
SceneReliquaryInfo reliquary = 6;
}
diff --git a/proto/AvatarExcelInfo.proto b/proto/AvatarExcelInfo.proto
new file mode 100644
index 0000000..901b60e
--- /dev/null
+++ b/proto/AvatarExcelInfo.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message AvatarExcelInfo {
+ uint64 prefab_path_hash = 1;
+ uint64 prefab_path_remote_hash = 2;
+ uint64 controller_path_hash = 3;
+ uint64 controller_path_remote_hash = 4;
+ uint64 combat_config_hash = 5;
+}
diff --git a/proto/AvatarExpeditionState.proto b/proto/AvatarExpeditionState.proto
old mode 100644
new mode 100755
index 0753dd6..7b43570
--- a/proto/AvatarExpeditionState.proto
+++ b/proto/AvatarExpeditionState.proto
@@ -3,8 +3,9 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum AvatarExpeditionState {
- AvatarExpeditionNone = 0;
- AvatarExpeditionDoing = 1;
- AvatarExpeditionFinishWaitReward = 2;
- AvatarExpeditionCallbackWaitReward = 3;
+ AVATAR_EXPEDITION_NONE = 0;
+ AVATAR_EXPEDITION_DOING = 1;
+ AVATAR_EXPEDITION_FINISH_WAIT_REWARD = 2;
+ AVATAR_EXPEDITION_CALLBACK_WAIT_REWARD = 3;
+ AVATAR_EXPEDITION_LOCKED = 4;
}
diff --git a/proto/AvatarFetterDataNotify.proto b/proto/AvatarFetterDataNotify.proto
index 7e5d8e2..cace9ab 100644
--- a/proto/AvatarFetterDataNotify.proto
+++ b/proto/AvatarFetterDataNotify.proto
@@ -1,9 +1,17 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-import "AvatarFetterInfo.proto";
-
-message AvatarFetterDataNotify {
- map fetterInfoMap = 1;
-}
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "AvatarFetterInfo.proto";
+
+message AvatarFetterDataNotify {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1685;
+ }
+
+ map fetter_info_map = 1;
+}
diff --git a/proto/AvatarFetterInfo.proto b/proto/AvatarFetterInfo.proto
old mode 100644
new mode 100755
index 408e7ac..00f3f60
--- a/proto/AvatarFetterInfo.proto
+++ b/proto/AvatarFetterInfo.proto
@@ -5,10 +5,10 @@ option java_package = "emu.grasscutter.net.proto";
import "FetterData.proto";
message AvatarFetterInfo {
- uint32 expNumber = 1;
- uint32 expLevel = 2;
- repeated uint32 openIdList = 3;
- repeated uint32 finishIdList = 4;
- repeated uint32 rewardedFetterLevelList = 5;
- repeated FetterData fetterList = 6;
+ uint32 exp_number = 1;
+ uint32 exp_level = 2;
+ repeated uint32 open_id_list = 3;
+ repeated uint32 finish_id_list = 4;
+ repeated uint32 rewarded_fetter_level_list = 5;
+ repeated FetterData fetter_list = 6;
}
diff --git a/proto/AvatarFetterLevelRewardReq.proto b/proto/AvatarFetterLevelRewardReq.proto
index c97f532..56d941a 100644
--- a/proto/AvatarFetterLevelRewardReq.proto
+++ b/proto/AvatarFetterLevelRewardReq.proto
@@ -1,8 +1,17 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-message AvatarFetterLevelRewardReq {
- uint64 avatarGuid = 1;
- uint32 fetterLevel = 2;
-}
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message AvatarFetterLevelRewardReq {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1624;
+ }
+
+ uint64 avatar_guid = 1;
+ uint32 fetter_level = 2;
+}
diff --git a/proto/AvatarFetterLevelRewardRsp.proto b/proto/AvatarFetterLevelRewardRsp.proto
index 6e4fc21..0fbc864 100644
--- a/proto/AvatarFetterLevelRewardRsp.proto
+++ b/proto/AvatarFetterLevelRewardRsp.proto
@@ -1,10 +1,18 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-message AvatarFetterLevelRewardRsp {
- int32 retcode = 1;
- uint64 avatarGuid = 2;
- uint32 fetterLevel = 3;
- uint32 rewardId = 4;
-}
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message AvatarFetterLevelRewardRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1704;
+ }
+
+ int32 retcode = 1;
+ uint64 avatar_guid = 2;
+ uint32 fetter_level = 3;
+ uint32 reward_id = 4;
+}
diff --git a/proto/AvatarFightPropNotify.proto b/proto/AvatarFightPropNotify.proto
old mode 100644
new mode 100755
index 8d24011..00a50c1
--- a/proto/AvatarFightPropNotify.proto
+++ b/proto/AvatarFightPropNotify.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarFightPropNotify {
- uint64 avatarGuid = 1;
- map fightPropMap = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1300;
+ }
+
+ uint64 avatar_guid = 1;
+ map fight_prop_map = 2;
}
diff --git a/proto/AvatarFightPropUpdateNotify.proto b/proto/AvatarFightPropUpdateNotify.proto
old mode 100644
new mode 100755
index 040c7d0..c187c29
--- a/proto/AvatarFightPropUpdateNotify.proto
+++ b/proto/AvatarFightPropUpdateNotify.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarFightPropUpdateNotify {
- uint64 avatarGuid = 1;
- map fightPropMap = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1201;
+ }
+
+ uint64 avatar_guid = 1;
+ map fight_prop_map = 2;
}
diff --git a/proto/AvatarFlycloakChangeNotify.proto b/proto/AvatarFlycloakChangeNotify.proto
old mode 100644
new mode 100755
index 4d7d353..e7a9257
--- a/proto/AvatarFlycloakChangeNotify.proto
+++ b/proto/AvatarFlycloakChangeNotify.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarFlycloakChangeNotify {
- uint64 avatarGuid = 1;
- uint32 flycloakId = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1759;
+ }
+
+ uint64 avatar_guid = 1;
+ uint32 flycloak_id = 2;
}
diff --git a/proto/AvatarGainCostumeNotify.proto b/proto/AvatarGainCostumeNotify.proto
old mode 100644
new mode 100755
index 54ef728..2989054
--- a/proto/AvatarGainCostumeNotify.proto
+++ b/proto/AvatarGainCostumeNotify.proto
@@ -2,6 +2,15 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarGainCostumeNotify {
- uint32 costumeId = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1734;
+ }
+
+ uint32 costume_id = 1;
}
diff --git a/proto/AvatarGainFlycloakNotify.proto b/proto/AvatarGainFlycloakNotify.proto
old mode 100644
new mode 100755
index d21a9cb..a3450d0
--- a/proto/AvatarGainFlycloakNotify.proto
+++ b/proto/AvatarGainFlycloakNotify.proto
@@ -2,6 +2,15 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarGainFlycloakNotify {
- uint32 flycloakId = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1604;
+ }
+
+ uint32 flycloak_id = 1;
}
diff --git a/proto/AvatarInfo.proto b/proto/AvatarInfo.proto
old mode 100644
new mode 100755
index f3ab4cc..3b77c90
--- a/proto/AvatarInfo.proto
+++ b/proto/AvatarInfo.proto
@@ -2,36 +2,39 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "AvatarEquipAffixInfo.proto";
-import "AvatarExpeditionState.proto";
-import "AvatarFetterInfo.proto";
-import "AvatarSkillInfo.proto";
-import "PropValue.proto";
import "TrialAvatarInfo.proto";
+import "AvatarFetterInfo.proto";
+import "AvatarExpeditionState.proto";
+import "AvatarExcelInfo.proto";
+import "PropValue.proto";
+import "AvatarSkillInfo.proto";
+import "AvatarEquipAffixInfo.proto";
message AvatarInfo {
- uint32 avatarId = 1;
+ uint32 avatar_id = 1;
uint64 guid = 2;
- map propMap = 3;
- uint32 lifeState = 4;
- repeated uint64 equipGuidList = 5;
- repeated uint32 talentIdList = 6;
- map fightPropMap = 7;
- TrialAvatarInfo trialAvatarInfoField = 9;
- map skillMap = 10;
- uint32 skillDepotId = 11;
- AvatarFetterInfo fetterInfo = 12;
- uint32 coreProudSkillLevel = 13;
- repeated uint32 inherentProudSkillList = 14;
- map skillLevelMap = 15;
- AvatarExpeditionState expeditionState = 16;
- map proudSkillExtraLevel = 17;
- bool isFocusFieldNumber = 18;
- uint32 avatarType = 19;
- repeated uint32 teamResonanceList = 20;
- uint32 wearingFlycloakId = 21;
- repeated AvatarEquipAffixInfo equipAffixList = 22;
- uint32 bornTime = 23;
- repeated uint32 pendingPromoteRewardListFieldNumber = 24;
- uint32 costumeId = 25;
+ map prop_map = 3;
+ uint32 life_state = 4;
+ repeated uint64 equip_guid_list = 5;
+ repeated uint32 talent_id_list = 6;
+ map fight_prop_map = 7;
+ TrialAvatarInfo trial_avatar_info = 9;
+ map skill_map = 10;
+ uint32 skill_depot_id = 11;
+ AvatarFetterInfo fetter_info = 12;
+ uint32 core_proud_skill_level = 13;
+ repeated uint32 inherent_proud_skill_list = 14;
+ map skill_level_map = 15;
+ AvatarExpeditionState expedition_state = 16;
+ map proud_skill_extra_level_map = 17;
+ bool is_focus = 18;
+ uint32 avatar_type = 19;
+ repeated uint32 team_resonance_list = 20;
+ uint32 wearing_flycloak_id = 21;
+ repeated AvatarEquipAffixInfo equip_affix_list = 22;
+ uint32 born_time = 23;
+ repeated uint32 pending_promote_reward_list = 24;
+ uint32 costume_id = 25;
+ AvatarExcelInfo excel_info = 26;
+ uint32 anim_hash = 27;
}
diff --git a/proto/AvatarLifeStateChangeNotify.proto b/proto/AvatarLifeStateChangeNotify.proto
old mode 100644
new mode 100755
index 0bf8160..9b0b810
--- a/proto/AvatarLifeStateChangeNotify.proto
+++ b/proto/AvatarLifeStateChangeNotify.proto
@@ -3,12 +3,22 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "PlayerDieType.proto";
+import "ServerBuff.proto";
message AvatarLifeStateChangeNotify {
- uint64 avatarGuid = 1;
- uint32 lifeState = 2;
- uint32 sourceEntityId = 3;
- string attackTag = 4;
- PlayerDieType dieType = 5;
- uint32 moveReliableSeq = 6;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1242;
+ }
+
+ uint64 avatar_guid = 1;
+ uint32 life_state = 2;
+ uint32 source_entity_id = 3;
+ string attack_tag = 4;
+ PlayerDieType die_type = 5;
+ uint32 move_reliable_seq = 6;
+ repeated ServerBuff server_buff_list = 7;
}
diff --git a/proto/AvatarPromoteGetRewardReq.proto b/proto/AvatarPromoteGetRewardReq.proto
old mode 100644
new mode 100755
index b0d5c22..1f9d73f
--- a/proto/AvatarPromoteGetRewardReq.proto
+++ b/proto/AvatarPromoteGetRewardReq.proto
@@ -1,8 +1,17 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-message AvatarPromoteGetRewardReq {
- uint64 avatarGuid = 1;
- uint32 promoteLevel = 2;
-}
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message AvatarPromoteGetRewardReq {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1701;
+ }
+
+ uint64 avatar_guid = 1;
+ uint32 promote_level = 2;
+}
diff --git a/proto/AvatarPromoteGetRewardRsp.proto b/proto/AvatarPromoteGetRewardRsp.proto
old mode 100644
new mode 100755
index 42c7d78..a4cae2b
--- a/proto/AvatarPromoteGetRewardRsp.proto
+++ b/proto/AvatarPromoteGetRewardRsp.proto
@@ -1,10 +1,19 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-message AvatarPromoteGetRewardRsp {
- int32 retcode = 1;
- uint64 avatarGuid = 2;
- uint32 promoteLevel = 3;
- uint32 rewardId = 4;
-}
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message AvatarPromoteGetRewardRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1764;
+ }
+
+ int32 retcode = 1;
+ uint64 avatar_guid = 2;
+ uint32 promote_level = 3;
+ uint32 reward_id = 4;
+}
diff --git a/proto/AvatarPromoteReq.proto b/proto/AvatarPromoteReq.proto
old mode 100644
new mode 100755
index 863ab83..1f14f38
--- a/proto/AvatarPromoteReq.proto
+++ b/proto/AvatarPromoteReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarPromoteReq {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1692;
+ }
+
uint64 guid = 1;
}
diff --git a/proto/AvatarPromoteRsp.proto b/proto/AvatarPromoteRsp.proto
old mode 100644
new mode 100755
index e64b9c9..3e12870
--- a/proto/AvatarPromoteRsp.proto
+++ b/proto/AvatarPromoteRsp.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarPromoteRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1728;
+ }
+
int32 retcode = 1;
uint64 guid = 2;
}
diff --git a/proto/AvatarPropNotify.proto b/proto/AvatarPropNotify.proto
old mode 100644
new mode 100755
index 231008d..46e7d41
--- a/proto/AvatarPropNotify.proto
+++ b/proto/AvatarPropNotify.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarPropNotify {
- uint64 avatarGuid = 1;
- map propMap = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1212;
+ }
+
+ uint64 avatar_guid = 1;
+ map prop_map = 2;
}
diff --git a/proto/AvatarSkillChangeNotify.proto b/proto/AvatarSkillChangeNotify.proto
old mode 100644
new mode 100755
index 0664126..e0a10ac
--- a/proto/AvatarSkillChangeNotify.proto
+++ b/proto/AvatarSkillChangeNotify.proto
@@ -2,11 +2,20 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarSkillChangeNotify {
- uint64 avatarGuid = 1;
- uint32 entityId = 2;
- uint32 skillDepotId = 3;
- uint32 avatarSkillId = 4;
- uint32 oldLevel = 5;
- uint32 curLevel = 6;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1091;
+ }
+
+ uint64 avatar_guid = 1;
+ uint32 entity_id = 2;
+ uint32 skill_depot_id = 3;
+ uint32 avatar_skill_id = 4;
+ uint32 old_level = 5;
+ uint32 cur_level = 6;
}
diff --git a/proto/AvatarSkillInfo.proto b/proto/AvatarSkillInfo.proto
old mode 100644
new mode 100755
index 27417ca..da5c086
--- a/proto/AvatarSkillInfo.proto
+++ b/proto/AvatarSkillInfo.proto
@@ -2,8 +2,9 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarSkillInfo {
- uint32 passCdTime = 1;
- repeated uint32 fullCdTimeList = 2;
- uint32 maxChargeCount = 3;
+ uint32 pass_cd_time = 1;
+ repeated uint32 full_cd_time_list = 2;
+ uint32 max_charge_count = 3;
}
diff --git a/proto/AvatarSkillUpgradeReq.proto b/proto/AvatarSkillUpgradeReq.proto
old mode 100644
new mode 100755
index 01e78e2..02ff737
--- a/proto/AvatarSkillUpgradeReq.proto
+++ b/proto/AvatarSkillUpgradeReq.proto
@@ -2,8 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarSkillUpgradeReq {
- uint64 avatarGuid = 1;
- uint32 avatarSkillId = 2;
- uint32 oldLevel = 3;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1026;
+ }
+
+ uint64 avatar_guid = 1;
+ uint32 avatar_skill_id = 2;
+ uint32 old_level = 3;
}
diff --git a/proto/AvatarSkillUpgradeRsp.proto b/proto/AvatarSkillUpgradeRsp.proto
old mode 100644
new mode 100755
index a7942f5..7ec89d6
--- a/proto/AvatarSkillUpgradeRsp.proto
+++ b/proto/AvatarSkillUpgradeRsp.proto
@@ -2,10 +2,19 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarSkillUpgradeRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1024;
+ }
+
int32 retcode = 1;
- uint64 avatarGuid = 2;
- uint32 avatarSkillId = 3;
- uint32 oldLevel = 4;
- uint32 curLevel = 5;
+ uint64 avatar_guid = 2;
+ uint32 avatar_skill_id = 3;
+ uint32 old_level = 4;
+ uint32 cur_level = 5;
}
diff --git a/proto/AvatarTeam.proto b/proto/AvatarTeam.proto
old mode 100644
new mode 100755
index 0ca666f..08b4885
--- a/proto/AvatarTeam.proto
+++ b/proto/AvatarTeam.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarTeam {
- repeated uint64 avatarGuidList = 1;
- string teamName = 2;
+ repeated uint64 avatar_guid_list = 1;
+ string team_name = 2;
}
diff --git a/proto/AvatarTeamResonanceInfo.proto b/proto/AvatarTeamResonanceInfo.proto
old mode 100644
new mode 100755
index beae1d2..b556906
--- a/proto/AvatarTeamResonanceInfo.proto
+++ b/proto/AvatarTeamResonanceInfo.proto
@@ -2,9 +2,10 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarTeamResonanceInfo {
- uint32 entityId = 1;
- uint64 avatarGuid = 2;
- repeated uint32 addTeamResonanceIdList = 3;
- repeated uint32 delTeamResonanceIdList = 4;
+ uint32 entity_id = 1;
+ uint64 avatar_guid = 2;
+ repeated uint32 add_team_resonance_id_list = 3;
+ repeated uint32 del_team_resonance_id_list = 4;
}
diff --git a/proto/AvatarTeamUpdateNotify.proto b/proto/AvatarTeamUpdateNotify.proto
old mode 100644
new mode 100755
index b68f7ce..ec6dbbd
--- a/proto/AvatarTeamUpdateNotify.proto
+++ b/proto/AvatarTeamUpdateNotify.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "AvatarTeam.proto";
message AvatarTeamUpdateNotify {
- map avatarTeamMap = 1;
- repeated uint64 tempAvatarGuidList = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1642;
+ }
+
+ map avatar_team_map = 1;
+ repeated uint64 temp_avatar_guid_list = 2;
}
diff --git a/proto/AvatarUnlockTalentNotify.proto b/proto/AvatarUnlockTalentNotify.proto
old mode 100644
new mode 100755
index 91500c3..b883c7d
--- a/proto/AvatarUnlockTalentNotify.proto
+++ b/proto/AvatarUnlockTalentNotify.proto
@@ -2,9 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarUnlockTalentNotify {
- uint64 avatarGuid = 1;
- uint32 entityId = 2;
- uint32 talentId = 3;
- uint32 skillDepotId = 4;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1089;
+ }
+
+ uint64 avatar_guid = 1;
+ uint32 entity_id = 2;
+ uint32 talent_id = 3;
+ uint32 skill_depot_id = 4;
}
diff --git a/proto/AvatarUpgradeReq.proto b/proto/AvatarUpgradeReq.proto
old mode 100644
new mode 100755
index 7ad936c..cc561e7
--- a/proto/AvatarUpgradeReq.proto
+++ b/proto/AvatarUpgradeReq.proto
@@ -2,8 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarUpgradeReq {
- uint32 itemId = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1691;
+ }
+
+ uint32 item_id = 1;
uint32 count = 2;
- uint64 avatarGuid = 3;
+ uint64 avatar_guid = 3;
}
diff --git a/proto/AvatarUpgradeRsp.proto b/proto/AvatarUpgradeRsp.proto
old mode 100644
new mode 100755
index 0d50cfa..f3a8f8a
--- a/proto/AvatarUpgradeRsp.proto
+++ b/proto/AvatarUpgradeRsp.proto
@@ -2,11 +2,20 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarUpgradeRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1720;
+ }
+
int32 retcode = 1;
- uint64 avatarGuid = 2;
- uint32 oldLevel = 3;
- uint32 curLevel = 4;
- map oldFightPropMap = 5;
- map curFightPropMap = 6;
+ uint64 avatar_guid = 2;
+ uint32 old_level = 3;
+ uint32 cur_level = 4;
+ map old_fight_prop_map = 5;
+ map cur_fight_prop_map = 6;
}
diff --git a/proto/AvatarWearFlycloakReq.proto b/proto/AvatarWearFlycloakReq.proto
old mode 100644
new mode 100755
index 92b067f..aa99c6d
--- a/proto/AvatarWearFlycloakReq.proto
+++ b/proto/AvatarWearFlycloakReq.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarWearFlycloakReq {
- uint64 avatarGuid = 1;
- uint32 flycloakId = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1635;
+ }
+
+ uint64 avatar_guid = 1;
+ uint32 flycloak_id = 2;
}
diff --git a/proto/AvatarWearFlycloakRsp.proto b/proto/AvatarWearFlycloakRsp.proto
old mode 100644
new mode 100755
index 78d179f..a78f0ca
--- a/proto/AvatarWearFlycloakRsp.proto
+++ b/proto/AvatarWearFlycloakRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message AvatarWearFlycloakRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1709;
+ }
+
int32 retcode = 1;
- uint64 avatarGuid = 2;
- uint32 flycloakId = 3;
+ uint64 avatar_guid = 2;
+ uint32 flycloak_id = 3;
}
diff --git a/proto/Birthday.proto b/proto/Birthday.proto
old mode 100644
new mode 100755
index b360bcf..027a9ed
--- a/proto/Birthday.proto
+++ b/proto/Birthday.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message Birthday {
uint32 month = 1;
uint32 day = 2;
diff --git a/proto/BlockInfo.proto b/proto/BlockInfo.proto
old mode 100644
new mode 100755
index 5905e35..93ecdad
--- a/proto/BlockInfo.proto
+++ b/proto/BlockInfo.proto
@@ -2,9 +2,10 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message BlockInfo {
- uint32 blockId = 1;
- uint32 dataVersion = 2;
- bytes binData = 3;
- bool isDirty = 4;
+ uint32 block_id = 1;
+ uint32 data_version = 2;
+ bytes bin_data = 3;
+ bool is_dirty = 4;
}
diff --git a/proto/BlossomBriefInfo.proto b/proto/BlossomBriefInfo.proto
new file mode 100644
index 0000000..884add4
--- /dev/null
+++ b/proto/BlossomBriefInfo.proto
@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "Vector.proto";
+
+message BlossomBriefInfo {
+ uint32 refresh_id = 1;
+ uint32 circle_camp_id = 2;
+ uint32 city_id = 3;
+ uint32 resin = 4;
+ Vector pos = 5;
+ uint32 reward_id = 6;
+ uint32 monster_level = 7;
+ bool is_guide_opened = 8;
+ uint32 state = 9;
+ uint32 scene_id = 10;
+}
diff --git a/proto/BlossomChestInfo.proto b/proto/BlossomChestInfo.proto
new file mode 100644
index 0000000..16d6099
--- /dev/null
+++ b/proto/BlossomChestInfo.proto
@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message BlossomChestInfo {
+ uint32 resin = 1;
+ repeated uint32 qualify_uid_list = 2;
+ repeated uint32 remain_uid_list = 3;
+ uint32 dead_time = 4;
+ uint32 blossom_refresh_type = 5;
+ uint32 refresh_id = 6;
+}
diff --git a/proto/BossChestInfo.proto b/proto/BossChestInfo.proto
new file mode 100644
index 0000000..72edf1a
--- /dev/null
+++ b/proto/BossChestInfo.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "WeeklyBossResinDiscountInfo.proto";
+
+message BossChestInfo {
+ uint32 monster_config_id = 1;
+ uint32 resin = 2;
+ repeated uint32 remain_uid_list = 3;
+ repeated uint32 qualify_uid_list = 4;
+ map uid_discount_map = 5;
+}
diff --git a/proto/BuildingInfo.proto b/proto/BuildingInfo.proto
new file mode 100644
index 0000000..1d02620
--- /dev/null
+++ b/proto/BuildingInfo.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message BuildingInfo {
+ uint32 building_id = 1;
+ uint32 point_config_id = 2;
+ uint32 cost = 3;
+ uint32 level = 4;
+ uint32 refund = 5;
+ uint32 owner_uid = 6;
+}
diff --git a/proto/CalcWeaponUpgradeReturnItemsReq.proto b/proto/CalcWeaponUpgradeReturnItemsReq.proto
old mode 100644
new mode 100755
index be6bcd9..1a7c5a8
--- a/proto/CalcWeaponUpgradeReturnItemsReq.proto
+++ b/proto/CalcWeaponUpgradeReturnItemsReq.proto
@@ -5,7 +5,16 @@ option java_package = "emu.grasscutter.net.proto";
import "ItemParam.proto";
message CalcWeaponUpgradeReturnItemsReq {
- uint64 targetWeaponGuid = 1;
- repeated uint64 foodWeaponGuidList = 2;
- repeated ItemParam itemParamList = 3;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 669;
+ }
+
+ uint64 target_weapon_guid = 1;
+ repeated uint64 food_weapon_guid_list = 2;
+ repeated ItemParam item_param_list = 3;
}
diff --git a/proto/CalcWeaponUpgradeReturnItemsRsp.proto b/proto/CalcWeaponUpgradeReturnItemsRsp.proto
old mode 100644
new mode 100755
index 5b0733d..a3d78aa
--- a/proto/CalcWeaponUpgradeReturnItemsRsp.proto
+++ b/proto/CalcWeaponUpgradeReturnItemsRsp.proto
@@ -5,7 +5,15 @@ option java_package = "emu.grasscutter.net.proto";
import "ItemParam.proto";
message CalcWeaponUpgradeReturnItemsRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 660;
+ }
+
int32 retcode = 1;
- uint64 targetWeaponGuid = 2;
- repeated ItemParam itemParamList = 3;
+ uint64 target_weapon_guid = 2;
+ repeated ItemParam item_param_list = 3;
}
diff --git a/proto/ChangeAvatarReq.proto b/proto/ChangeAvatarReq.proto
old mode 100644
new mode 100755
index 8ef593e..d6fdc2b
--- a/proto/ChangeAvatarReq.proto
+++ b/proto/ChangeAvatarReq.proto
@@ -5,8 +5,17 @@ option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
message ChangeAvatarReq {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1669;
+ }
+
uint64 guid = 1;
- uint32 skillId = 2;
- bool isMove = 3;
- Vector movePos = 4;
+ uint32 skill_id = 2;
+ bool is_move = 3;
+ Vector move_pos = 4;
}
diff --git a/proto/ChangeAvatarRsp.proto b/proto/ChangeAvatarRsp.proto
old mode 100644
new mode 100755
index 08281c4..d7308e5
--- a/proto/ChangeAvatarRsp.proto
+++ b/proto/ChangeAvatarRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ChangeAvatarRsp {
- uint32 retcode = 1;
- uint64 currGuid = 2;
- uint32 skillId = 3;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1634;
+ }
+
+ int32 retcode = 1;
+ uint64 cur_guid = 2;
+ uint32 skill_id = 3;
}
diff --git a/proto/ChangeEnergyReason.proto b/proto/ChangeEnergyReason.proto
new file mode 100644
index 0000000..5e75583
--- /dev/null
+++ b/proto/ChangeEnergyReason.proto
@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+enum ChangeEnergyReason {
+ CHANGE_ENERGY_NONE = 0;
+ CHANGE_ENERGY_SKILL_START = 1;
+}
diff --git a/proto/ChangeGameTimeReq.proto b/proto/ChangeGameTimeReq.proto
old mode 100644
new mode 100755
index 474c964..9c08068
--- a/proto/ChangeGameTimeReq.proto
+++ b/proto/ChangeGameTimeReq.proto
@@ -2,7 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ChangeGameTimeReq {
- uint32 gameTime = 1;
- bool isForceSet = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 161;
+ }
+
+ uint32 game_time = 1;
+ bool is_force_set = 2;
+ uint32 extra_days = 3;
}
diff --git a/proto/ChangeGameTimeRsp.proto b/proto/ChangeGameTimeRsp.proto
old mode 100644
new mode 100755
index 75c94a3..2217922
--- a/proto/ChangeGameTimeRsp.proto
+++ b/proto/ChangeGameTimeRsp.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ChangeGameTimeRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 179;
+ }
+
int32 retcode = 1;
- uint32 curGameTime = 2;
+ uint32 cur_game_time = 2;
+ uint32 extra_days = 3;
}
diff --git a/proto/ChangeHpReason.proto b/proto/ChangeHpReason.proto
old mode 100644
new mode 100755
diff --git a/proto/ChangeMailStarNotify.proto b/proto/ChangeMailStarNotify.proto
deleted file mode 100644
index 05e5b22..0000000
--- a/proto/ChangeMailStarNotify.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-message ChangeMailStarNotify {
- repeated uint32 mailIdList = 1;
- bool isStar = 2;
-}
diff --git a/proto/ChangeMpTeamAvatarReq.proto b/proto/ChangeMpTeamAvatarReq.proto
old mode 100644
new mode 100755
index 8a90c87..9ab8273
--- a/proto/ChangeMpTeamAvatarReq.proto
+++ b/proto/ChangeMpTeamAvatarReq.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ChangeMpTeamAvatarReq {
- repeated uint64 avatarGuidList = 1;
- uint64 curAvatarGuid = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1731;
+ }
+
+ repeated uint64 avatar_guid_list = 1;
+ uint64 cur_avatar_guid = 2;
}
diff --git a/proto/ChangeMpTeamAvatarRsp.proto b/proto/ChangeMpTeamAvatarRsp.proto
old mode 100644
new mode 100755
index ae0b499..4aca753
--- a/proto/ChangeMpTeamAvatarRsp.proto
+++ b/proto/ChangeMpTeamAvatarRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ChangeMpTeamAvatarRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1640;
+ }
+
int32 retcode = 1;
- repeated uint64 avatarGuidList = 2;
- uint64 curAvatarGuid = 3;
+ repeated uint64 avatar_guid_list = 2;
+ uint64 cur_avatar_guid = 3;
}
diff --git a/proto/ChangeTeamNameReq.proto b/proto/ChangeTeamNameReq.proto
old mode 100644
new mode 100755
index 87423b3..764b498
--- a/proto/ChangeTeamNameReq.proto
+++ b/proto/ChangeTeamNameReq.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ChangeTeamNameReq {
- int32 teamId = 1;
- string teamName = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1693;
+ }
+
+ int32 team_id = 1;
+ string team_name = 2;
}
diff --git a/proto/ChangeTeamNameRsp.proto b/proto/ChangeTeamNameRsp.proto
old mode 100644
new mode 100755
index 51607c6..1e0ba48
--- a/proto/ChangeTeamNameRsp.proto
+++ b/proto/ChangeTeamNameRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ChangeTeamNameRsp {
- int32 teamId = 1;
- string teamName = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1788;
+ }
+
+ int32 team_id = 1;
+ string team_name = 2;
int32 retcode = 3;
}
diff --git a/proto/ChatInfo.proto b/proto/ChatInfo.proto
old mode 100644
new mode 100755
index 7b47d7f..b1f8f33
--- a/proto/ChatInfo.proto
+++ b/proto/ChatInfo.proto
@@ -2,17 +2,26 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "SystemHint.proto";
message ChatInfo {
+ enum SystemHintType {
+ CHAT_NONE = 0;
+ CHAT_ENTER_WORLD = 1;
+ CHAT_LEAVE_WORLD = 2;
+ }
+
+ message SystemHint {
+ uint32 type = 1;
+ }
+
+ oneof Content {
+ string text = 100;
+ uint32 icon = 101;
+ SystemHint system_hint = 102;
+ }
uint32 time = 1;
uint32 uid = 2;
uint32 sequence = 3;
- uint32 toUid = 4;
- bool isRead = 5;
- oneof content {
- string text = 100;
- uint32 icon = 101;
- SystemHint systemHint = 102;
- }
+ uint32 to_uid = 4;
+ bool is_read = 5;
}
diff --git a/proto/ChooseCurAvatarTeamReq.proto b/proto/ChooseCurAvatarTeamReq.proto
old mode 100644
new mode 100755
index bc9bd84..1ea02de
--- a/proto/ChooseCurAvatarTeamReq.proto
+++ b/proto/ChooseCurAvatarTeamReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ChooseCurAvatarTeamReq {
- uint32 teamId = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1663;
+ }
+
+ uint32 team_id = 1;
}
diff --git a/proto/ChooseCurAvatarTeamRsp.proto b/proto/ChooseCurAvatarTeamRsp.proto
old mode 100644
new mode 100755
index 2a168a7..0b15037
--- a/proto/ChooseCurAvatarTeamRsp.proto
+++ b/proto/ChooseCurAvatarTeamRsp.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ChooseCurAvatarTeamRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1798;
+ }
+
int32 retcode = 1;
- uint32 curTeamId = 2;
+ uint32 cur_team_id = 2;
}
diff --git a/proto/CityInfo.proto b/proto/CityInfo.proto
old mode 100644
new mode 100755
index 8d6f31b..5bf9163
--- a/proto/CityInfo.proto
+++ b/proto/CityInfo.proto
@@ -2,8 +2,9 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message CityInfo {
- uint32 cityId = 1;
+ uint32 city_id = 1;
uint32 level = 2;
- uint32 crystalNum = 3;
+ uint32 crystal_num = 3;
}
diff --git a/proto/ClientAbilityChangeNotify.proto b/proto/ClientAbilityChangeNotify.proto
old mode 100644
new mode 100755
index 19f1fd5..cb3b235
--- a/proto/ClientAbilityChangeNotify.proto
+++ b/proto/ClientAbilityChangeNotify.proto
@@ -5,6 +5,15 @@ option java_package = "emu.grasscutter.net.proto";
import "AbilityInvokeEntry.proto";
message ClientAbilityChangeNotify {
- uint32 entityId = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1126;
+ }
+
+ uint32 entity_id = 1;
repeated AbilityInvokeEntry invokes = 2;
}
diff --git a/proto/ClientAbilityInitBeginNotify.proto b/proto/ClientAbilityInitBeginNotify.proto
old mode 100644
new mode 100755
index 03bc7a6..82dbd5b
--- a/proto/ClientAbilityInitBeginNotify.proto
+++ b/proto/ClientAbilityInitBeginNotify.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ClientAbilityInitBeginNotify {
- uint32 entityId = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1189;
+ }
+
+ uint32 entity_id = 1;
}
diff --git a/proto/ClientAbilityInitFinishNotify.proto b/proto/ClientAbilityInitFinishNotify.proto
old mode 100644
new mode 100755
index 1078434..a591eaa
--- a/proto/ClientAbilityInitFinishNotify.proto
+++ b/proto/ClientAbilityInitFinishNotify.proto
@@ -5,6 +5,15 @@ option java_package = "emu.grasscutter.net.proto";
import "AbilityInvokeEntry.proto";
message ClientAbilityInitFinishNotify {
- uint32 entityId = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1184;
+ }
+
+ uint32 entity_id = 1;
repeated AbilityInvokeEntry invokes = 2;
}
diff --git a/proto/ClientGadgetInfo.proto b/proto/ClientGadgetInfo.proto
new file mode 100644
index 0000000..14add09
--- /dev/null
+++ b/proto/ClientGadgetInfo.proto
@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message ClientGadgetInfo {
+ uint32 camp_id = 1;
+ uint32 camp_type = 2;
+ uint64 guid = 3;
+ uint32 owner_entity_id = 4;
+ uint32 target_entity_id = 5;
+ bool async_load = 6;
+}
diff --git a/proto/CombatInvocationsNotify.proto b/proto/CombatInvocationsNotify.proto
old mode 100644
new mode 100755
index 8669d1a..0f5c8e4
--- a/proto/CombatInvocationsNotify.proto
+++ b/proto/CombatInvocationsNotify.proto
@@ -5,5 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "CombatInvokeEntry.proto";
message CombatInvocationsNotify {
- repeated CombatInvokeEntry invokeList = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 359;
+ }
+
+ repeated CombatInvokeEntry invoke_list = 1;
}
diff --git a/proto/CombatInvokeEntry.proto b/proto/CombatInvokeEntry.proto
old mode 100644
new mode 100755
index 43e2eed..dea1caf
--- a/proto/CombatInvokeEntry.proto
+++ b/proto/CombatInvokeEntry.proto
@@ -6,7 +6,7 @@ import "CombatTypeArgument.proto";
import "ForwardType.proto";
message CombatInvokeEntry {
- CombatTypeArgument argumentType = 1;
- ForwardType forwardType = 2;
- bytes combatData = 3;
+ CombatTypeArgument argument_type = 1;
+ ForwardType forward_type = 2;
+ bytes combat_data = 3;
}
diff --git a/proto/CombatTypeArgument.proto b/proto/CombatTypeArgument.proto
old mode 100644
new mode 100755
index ab5eef0..9116aba
--- a/proto/CombatTypeArgument.proto
+++ b/proto/CombatTypeArgument.proto
@@ -3,19 +3,20 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum CombatTypeArgument {
- CombatNone = 0;
- CombatEvtBeingHit = 1;
- CombatAnimatorStateChanged = 2;
- CombatFaceToDir = 3;
- CombatSetAttackTarget = 4;
- CombatRushMove = 5;
- CombatAnimatorParameterChanged = 6;
- EntityMove = 7;
- SyncEntityPosition = 8;
- CombatSteerMotionInfo = 9;
- CombatForceSetPosInfo = 10;
- CombatCompensatePosDiff = 11;
- CombatMonsterDoBlink = 12;
- CombatFixedRushMove = 13;
- CombatSyncTransform = 14;
+ COMBAT_NONE = 0;
+ COMBAT_EVT_BEING_HIT = 1;
+ COMBAT_ANIMATOR_STATE_CHANGED = 2;
+ COMBAT_FACE_TO_DIR = 3;
+ COMBAT_SET_ATTACK_TARGET = 4;
+ COMBAT_RUSH_MOVE = 5;
+ COMBAT_ANIMATOR_PARAMETER_CHANGED = 6;
+ ENTITY_MOVE = 7;
+ SYNC_ENTITY_POSITION = 8;
+ COMBAT_STEER_MOTION_INFO = 9;
+ COMBAT_FORCE_SET_POS_INFO = 10;
+ COMBAT_COMPENSATE_POS_DIFF = 11;
+ COMBAT_MONSTER_DO_BLINK = 12;
+ COMBAT_FIXED_RUSH_MOVE = 13;
+ COMBAT_SYNC_TRANSFORM = 14;
+ COMBAT_LIGHT_CORE_MOVE = 15;
}
diff --git a/proto/CombineDataNotify.proto b/proto/CombineDataNotify.proto
new file mode 100644
index 0000000..1ef4c8a
--- /dev/null
+++ b/proto/CombineDataNotify.proto
@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message CombineDataNotify {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 657;
+ }
+
+ repeated uint32 combine_id_list = 1;
+}
diff --git a/proto/CombineFormulaDataNotify.proto b/proto/CombineFormulaDataNotify.proto
new file mode 100644
index 0000000..3c13553
--- /dev/null
+++ b/proto/CombineFormulaDataNotify.proto
@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message CombineFormulaDataNotify {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 682;
+ }
+
+ uint32 combine_id = 1;
+ bool is_locked = 2;
+}
diff --git a/proto/CombineReq.proto b/proto/CombineReq.proto
new file mode 100644
index 0000000..58d38e1
--- /dev/null
+++ b/proto/CombineReq.proto
@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message CombineReq {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 655;
+ }
+
+ uint32 combine_id = 1;
+ uint32 combine_count = 2;
+ uint64 avatar_guid = 3;
+}
diff --git a/proto/CombineRsp.proto b/proto/CombineRsp.proto
new file mode 100644
index 0000000..bba446a
--- /dev/null
+++ b/proto/CombineRsp.proto
@@ -0,0 +1,25 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "ItemParam.proto";
+
+message CombineRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 695;
+ }
+
+ int32 retcode = 1;
+ uint32 combine_id = 2;
+ uint32 combine_count = 3;
+ uint64 avatar_guid = 4;
+ repeated ItemParam cost_item_list = 5;
+ repeated ItemParam result_item_list = 6;
+ repeated ItemParam total_random_item_list = 7;
+ repeated ItemParam total_return_item_list = 8;
+ repeated ItemParam total_extra_item_list = 9;
+}
diff --git a/proto/CoopCg.proto b/proto/CoopCg.proto
old mode 100644
new mode 100755
index 5702ac6..a507579
--- a/proto/CoopCg.proto
+++ b/proto/CoopCg.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message CoopCg {
uint32 id = 1;
- bool isUnlock = 2;
+ bool is_unlock = 2;
}
diff --git a/proto/CoopChapter.proto b/proto/CoopChapter.proto
old mode 100644
new mode 100755
index 817f235..360df62
--- a/proto/CoopChapter.proto
+++ b/proto/CoopChapter.proto
@@ -2,20 +2,26 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "CoopCg.proto";
-import "CoopChapterState.proto";
import "CoopPoint.proto";
import "CoopReward.proto";
+import "CoopCg.proto";
message CoopChapter {
+ enum State {
+ CLOSE = 0;
+ COND_NOT_MEET = 1;
+ COND_MEET = 2;
+ ACCEPT = 3;
+ }
+
uint32 id = 1;
- CoopChapterState state = 2;
- repeated uint32 lockReasonList = 3;
- repeated CoopPoint coopPointList = 4;
- repeated CoopReward coopRewardList = 5;
- repeated CoopCg coopCgList = 6;
- uint32 totalEndCount = 7;
- uint32 finishedEndCount = 8;
- map seenEndingMap = 9;
- repeated uint32 finishDialogList = 10;
+ State state = 2;
+ repeated uint32 lock_reason_list = 3;
+ repeated CoopPoint coop_point_list = 4;
+ repeated CoopReward coop_reward_list = 5;
+ repeated CoopCg coop_cg_list = 6;
+ uint32 total_end_count = 7;
+ uint32 finished_end_count = 8;
+ map seen_ending_map = 9;
+ repeated uint32 finish_dialog_list = 10;
}
diff --git a/proto/CoopChapterState.proto b/proto/CoopChapterState.proto
old mode 100644
new mode 100755
diff --git a/proto/CoopDataNotify.proto b/proto/CoopDataNotify.proto
old mode 100644
new mode 100755
index ea1ee81..a9e673f
--- a/proto/CoopDataNotify.proto
+++ b/proto/CoopDataNotify.proto
@@ -5,8 +5,16 @@ option java_package = "emu.grasscutter.net.proto";
import "CoopChapter.proto";
message CoopDataNotify {
- repeated CoopChapter chapterList = 1;
- bool isHaveProgress = 2;
- uint32 curCoopPoint = 3;
- repeated uint32 viewedChapterList = 4;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1957;
+ }
+
+ repeated CoopChapter chapter_list = 1;
+ bool is_have_progress = 2;
+ uint32 cur_coop_point = 3;
+ repeated uint32 viewed_chapter_list = 4;
}
diff --git a/proto/CoopPoint.proto b/proto/CoopPoint.proto
old mode 100644
new mode 100755
index f539144..d0c728e
--- a/proto/CoopPoint.proto
+++ b/proto/CoopPoint.proto
@@ -2,10 +2,15 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "CoopPointState.proto";
message CoopPoint {
+ enum State {
+ UNSTARTED = 0;
+ STARTED = 1;
+ FINISHED = 2;
+ }
+
uint32 id = 1;
- CoopPointState state = 2;
- uint32 selfConfidence = 3;
+ State state = 2;
+ uint32 self_confidence = 3;
}
diff --git a/proto/CoopPointState.proto b/proto/CoopPointState.proto
old mode 100644
new mode 100755
diff --git a/proto/CoopReward.proto b/proto/CoopReward.proto
old mode 100644
new mode 100755
index 47086cc..38cac72
--- a/proto/CoopReward.proto
+++ b/proto/CoopReward.proto
@@ -2,9 +2,14 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "CoopRewardState.proto";
message CoopReward {
+ enum State {
+ UNLOCK = 0;
+ LOCK = 1;
+ TAKEN = 2;
+ }
+
uint32 id = 1;
- CoopRewardState state = 2;
+ State state = 2;
}
diff --git a/proto/CoopRewardState.proto b/proto/CoopRewardState.proto
old mode 100644
new mode 100755
diff --git a/proto/CountDownDelete.proto b/proto/CountDownDelete.proto
old mode 100644
new mode 100755
diff --git a/proto/CurVehicleInfo.proto b/proto/CurVehicleInfo.proto
new file mode 100644
index 0000000..3fba87e
--- /dev/null
+++ b/proto/CurVehicleInfo.proto
@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message CurVehicleInfo {
+ uint32 entity_id = 1;
+ uint32 pos = 2;
+}
diff --git a/proto/CustomCommonNodeInfo.proto b/proto/CustomCommonNodeInfo.proto
new file mode 100644
index 0000000..9082f6b
--- /dev/null
+++ b/proto/CustomCommonNodeInfo.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message CustomCommonNodeInfo {
+ int32 parent_index = 1;
+ uint32 config_id = 2;
+ string slot_identifier = 3;
+}
diff --git a/proto/CustomGadgetTreeInfo.proto b/proto/CustomGadgetTreeInfo.proto
new file mode 100644
index 0000000..0af66df
--- /dev/null
+++ b/proto/CustomGadgetTreeInfo.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "CustomCommonNodeInfo.proto";
+
+message CustomGadgetTreeInfo {
+ repeated CustomCommonNodeInfo node_list = 1;
+}
diff --git a/proto/DateTimeDelete.proto b/proto/DateTimeDelete.proto
old mode 100644
new mode 100755
diff --git a/proto/DealAddFriendReq.proto b/proto/DealAddFriendReq.proto
old mode 100644
new mode 100755
index 5a0fa08..1941a5c
--- a/proto/DealAddFriendReq.proto
+++ b/proto/DealAddFriendReq.proto
@@ -5,6 +5,15 @@ option java_package = "emu.grasscutter.net.proto";
import "DealAddFriendResultType.proto";
message DealAddFriendReq {
- uint32 targetUid = 1;
- DealAddFriendResultType dealAddFriendResult = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 4094;
+ }
+
+ uint32 target_uid = 1;
+ DealAddFriendResultType deal_add_friend_result = 2;
}
diff --git a/proto/DealAddFriendResultType.proto b/proto/DealAddFriendResultType.proto
old mode 100644
new mode 100755
index d9516f5..f0925b0
--- a/proto/DealAddFriendResultType.proto
+++ b/proto/DealAddFriendResultType.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-enum DealAddFriendResultType {
- DealAddFriendReject = 0;
- DealAddFriendAccept = 1;
+enum DealAddFriendResultType {
+ DEAL_ADD_FRIEND_REJECT = 0;
+ DEAL_ADD_FRIEND_ACCEPT = 1;
}
diff --git a/proto/DealAddFriendRsp.proto b/proto/DealAddFriendRsp.proto
old mode 100644
new mode 100755
index 330c3b3..b8961f4
--- a/proto/DealAddFriendRsp.proto
+++ b/proto/DealAddFriendRsp.proto
@@ -5,7 +5,16 @@ option java_package = "emu.grasscutter.net.proto";
import "DealAddFriendResultType.proto";
message DealAddFriendRsp {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 4042;
+ }
+
int32 retcode = 1;
- uint32 targetUid = 2;
- DealAddFriendResultType dealAddFriendResult = 3;
+ uint32 target_uid = 2;
+ DealAddFriendResultType deal_add_friend_result = 3;
}
diff --git a/proto/DelMailRsp.proto b/proto/DelMailRsp.proto
deleted file mode 100644
index 2fd5a7b..0000000
--- a/proto/DelMailRsp.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-message DelMailRsp {
- int32 retcode = 1;
- repeated uint32 mailIdList = 2;
-}
diff --git a/proto/DelTeamEntityNotify.proto b/proto/DelTeamEntityNotify.proto
old mode 100644
new mode 100755
index a5fbda5..28ff116
--- a/proto/DelTeamEntityNotify.proto
+++ b/proto/DelTeamEntityNotify.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message DelTeamEntityNotify {
- uint32 sceneId = 1;
- repeated uint32 delEntityIdList = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 366;
+ }
+
+ uint32 scene_id = 1;
+ repeated uint32 del_entity_id_list = 2;
}
diff --git a/proto/DelayWeekCountDownDelete.proto b/proto/DelayWeekCountDownDelete.proto
old mode 100644
new mode 100755
diff --git a/proto/DeleteFriendNotify.proto b/proto/DeleteFriendNotify.proto
old mode 100644
new mode 100755
index 224e411..c8befa9
--- a/proto/DeleteFriendNotify.proto
+++ b/proto/DeleteFriendNotify.proto
@@ -2,6 +2,15 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message DeleteFriendNotify {
- uint32 targetUid = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 4032;
+ }
+
+ uint32 target_uid = 1;
}
diff --git a/proto/DeleteFriendReq.proto b/proto/DeleteFriendReq.proto
old mode 100644
new mode 100755
index fa4b371..b27fd96
--- a/proto/DeleteFriendReq.proto
+++ b/proto/DeleteFriendReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message DeleteFriendReq {
- uint32 targetUid = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 4012;
+ }
+
+ uint32 target_uid = 1;
}
diff --git a/proto/DeleteFriendRsp.proto b/proto/DeleteFriendRsp.proto
old mode 100644
new mode 100755
index 666e670..fe94120
--- a/proto/DeleteFriendRsp.proto
+++ b/proto/DeleteFriendRsp.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message DeleteFriendRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 4026;
+ }
+
int32 retcode = 1;
- uint32 targetUid = 2;
+ uint32 target_uid = 2;
}
diff --git a/proto/DestroyMaterialReq.proto b/proto/DestroyMaterialReq.proto
old mode 100644
new mode 100755
index 6dad136..a2a0915
--- a/proto/DestroyMaterialReq.proto
+++ b/proto/DestroyMaterialReq.proto
@@ -5,5 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "MaterialInfo.proto";
message DestroyMaterialReq {
- repeated MaterialInfo materialList = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 687;
+ }
+
+ repeated MaterialInfo material_list = 1;
}
diff --git a/proto/DestroyMaterialRsp.proto b/proto/DestroyMaterialRsp.proto
old mode 100644
new mode 100755
index edbad05..2297843
--- a/proto/DestroyMaterialRsp.proto
+++ b/proto/DestroyMaterialRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message DestroyMaterialRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 641;
+ }
+
int32 retcode = 1;
- repeated uint32 itemIdList = 2;
- repeated uint32 itemCountList = 3;
+ repeated uint32 item_id_list = 2;
+ repeated uint32 item_count_list = 3;
}
diff --git a/proto/DoGachaReq.proto b/proto/DoGachaReq.proto
old mode 100644
new mode 100755
index b841b53..85a632c
--- a/proto/DoGachaReq.proto
+++ b/proto/DoGachaReq.proto
@@ -2,10 +2,20 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message DoGachaReq {
- uint32 gachaType = 1;
- uint32 gachaTimes = 2;
- uint32 gachaRandom = 3;
- uint32 gachaScheduleId = 4;
- string gachaTag = 5;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1589;
+ }
+
+ uint32 gacha_type = 1;
+ uint32 gacha_times = 2;
+ uint32 gacha_random = 3;
+ uint32 gacha_schedule_id = 4;
+ string gacha_tag = 5;
}
diff --git a/proto/DoGachaRsp.proto b/proto/DoGachaRsp.proto
old mode 100644
new mode 100755
index 3aebde5..83fd928
--- a/proto/DoGachaRsp.proto
+++ b/proto/DoGachaRsp.proto
@@ -5,16 +5,27 @@ option java_package = "emu.grasscutter.net.proto";
import "GachaItem.proto";
message DoGachaRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1584;
+ }
+
int32 retcode = 1;
- uint32 gachaType = 2;
- uint32 gachaTimes = 3;
- uint32 gachaScheduleId = 4;
- repeated GachaItem gachaItemList = 5;
- uint32 newGachaRandom = 6;
- uint32 costItemId = 7;
- uint32 costItemNum = 8;
- uint32 tenCostItemId = 9;
- uint32 tenCostItemNum = 10;
- uint32 leftGachaTimes = 11;
- uint32 gachaTimesLimit = 12;
+ uint32 gacha_type = 2;
+ uint32 gacha_times = 3;
+ uint32 gacha_schedule_id = 4;
+ repeated GachaItem gacha_item_list = 5;
+ uint32 new_gacha_random = 6;
+ uint32 cost_item_id = 7;
+ uint32 cost_item_num = 8;
+ uint32 ten_cost_item_id = 9;
+ uint32 ten_cost_item_num = 10;
+ uint32 left_gacha_times = 11;
+ uint32 gacha_times_limit = 12;
+ uint32 wish_item_id = 13;
+ uint32 wish_progress = 14;
+ uint32 wish_max_progress = 15;
}
diff --git a/proto/DropHintNotify.proto b/proto/DropHintNotify.proto
old mode 100644
new mode 100755
index e0d7cf5..c22cb3d
--- a/proto/DropHintNotify.proto
+++ b/proto/DropHintNotify.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
message DropHintNotify {
- repeated uint32 itemIdList = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 609;
+ }
+
+ repeated uint32 item_id_list = 1;
Vector position = 2;
}
diff --git a/proto/DungeonEntryInfo.proto b/proto/DungeonEntryInfo.proto
old mode 100644
new mode 100755
index 0af679a..b95ea75
--- a/proto/DungeonEntryInfo.proto
+++ b/proto/DungeonEntryInfo.proto
@@ -5,13 +5,13 @@ option java_package = "emu.grasscutter.net.proto";
import "WeeklyBossResinDiscountInfo.proto";
message DungeonEntryInfo {
- uint32 dungeonId = 1;
- bool isPassed = 2;
- uint32 leftTimes = 3;
- uint32 startTime = 4;
- uint32 endTime = 5;
- uint32 maxBossChestNum = 6;
- uint32 bossChestNum = 7;
- uint32 nextRefreshTime = 8;
- WeeklyBossResinDiscountInfo weeklyBossResinDiscountInfo = 9;
+ uint32 dungeon_id = 1;
+ bool is_passed = 2;
+ uint32 left_times = 3;
+ uint32 start_time = 4;
+ uint32 end_time = 5;
+ uint32 max_boss_chest_num = 6;
+ uint32 boss_chest_num = 7;
+ uint32 next_refresh_time = 8;
+ WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 9;
}
diff --git a/proto/DungeonEntryInfoReq.proto b/proto/DungeonEntryInfoReq.proto
old mode 100644
new mode 100755
index 12557f4..9bcc2ed
--- a/proto/DungeonEntryInfoReq.proto
+++ b/proto/DungeonEntryInfoReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message DungeonEntryInfoReq {
- uint32 pointId = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 949;
+ }
+
+ uint32 point_id = 1;
}
diff --git a/proto/DungeonEntryInfoRsp.proto b/proto/DungeonEntryInfoRsp.proto
old mode 100644
new mode 100755
index d83bcef..4e529f9
--- a/proto/DungeonEntryInfoRsp.proto
+++ b/proto/DungeonEntryInfoRsp.proto
@@ -5,8 +5,16 @@ option java_package = "emu.grasscutter.net.proto";
import "DungeonEntryInfo.proto";
message DungeonEntryInfoRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 918;
+ }
+
int32 retcode = 1;
- uint32 pointId = 2;
- repeated DungeonEntryInfo dungeonEntryList = 3;
- uint32 recommendDungeonId = 4;
+ uint32 point_id = 2;
+ repeated DungeonEntryInfo dungeon_entry_list = 3;
+ uint32 recommend_dungeon_id = 4;
}
diff --git a/proto/GetAllMailReq.proto b/proto/EchoShellInfo.proto
similarity index 61%
rename from proto/GetAllMailReq.proto
rename to proto/EchoShellInfo.proto
index d116e09..db8d40a 100644
--- a/proto/GetAllMailReq.proto
+++ b/proto/EchoShellInfo.proto
@@ -2,6 +2,6 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-message GetAllMailReq {
- bool isGiftMail = 1;
+message EchoShellInfo {
+ uint32 shell_id = 1;
}
diff --git a/proto/EnterSceneDoneRsp.proto b/proto/EnterSceneDoneRsp.proto
old mode 100644
new mode 100755
index df15567..e4d9d42
--- a/proto/EnterSceneDoneRsp.proto
+++ b/proto/EnterSceneDoneRsp.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message EnterSceneDoneRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 248;
+ }
+
int32 retcode = 1;
- uint32 enterSceneToken = 2;
+ uint32 enter_scene_token = 2;
}
diff --git a/proto/EnterScenePeerNotify.proto b/proto/EnterScenePeerNotify.proto
old mode 100644
new mode 100755
index 17d5302..61f3922
--- a/proto/EnterScenePeerNotify.proto
+++ b/proto/EnterScenePeerNotify.proto
@@ -2,9 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message EnterScenePeerNotify {
- uint32 destSceneId = 1;
- uint32 peerId = 2;
- uint32 hostPeerId = 3;
- uint32 EnterSceneToken = 4;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 223;
+ }
+
+ uint32 dest_scene_id = 1;
+ uint32 peer_id = 2;
+ uint32 host_peer_id = 3;
+ uint32 enter_scene_token = 4;
}
diff --git a/proto/EnterSceneReadyRsp.proto b/proto/EnterSceneReadyRsp.proto
old mode 100644
new mode 100755
index 6cde8d1..93ba800
--- a/proto/EnterSceneReadyRsp.proto
+++ b/proto/EnterSceneReadyRsp.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message EnterSceneReadyRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 245;
+ }
+
int32 retcode = 1;
- uint32 enterSceneToken = 2;
+ uint32 enter_scene_token = 2;
}
diff --git a/proto/EnterType.proto b/proto/EnterType.proto
old mode 100644
new mode 100755
index 6794046..57a2e68
--- a/proto/EnterType.proto
+++ b/proto/EnterType.proto
@@ -3,15 +3,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum EnterType {
- EnterNone = 0;
- EnterSelf = 1;
- EnterGoto = 2;
- EnterJump = 3;
- EnterOther = 4;
- EnterBack = 5;
- EnterDungeon = 6;
- EnterDungeonReplay = 7;
- EnterGotoByPortal = 8;
- EnterSelfHome = 9;
- EnterOtherHome = 10;
+ ENTER_NONE = 0;
+ ENTER_SELF = 1;
+ ENTER_GOTO = 2;
+ ENTER_JUMP = 3;
+ ENTER_OTHER = 4;
+ ENTER_BACK = 5;
+ ENTER_DUNGEON = 6;
+ ENTER_DUNGEON_REPLAY = 7;
+ ENTER_GOTO_BY_PORTAL = 8;
+ ENTER_SELF_HOME = 9;
+ ENTER_OTHER_HOME = 10;
+ ENTER_GOTO_RECREATE = 11;
}
diff --git a/proto/EnterWorldAreaReq.proto b/proto/EnterWorldAreaReq.proto
old mode 100644
new mode 100755
index d367117..45d5358
--- a/proto/EnterWorldAreaReq.proto
+++ b/proto/EnterWorldAreaReq.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message EnterWorldAreaReq {
- uint32 areaType = 1;
- uint32 areaId = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 209;
+ }
+
+ uint32 area_type = 1;
+ uint32 area_id = 2;
}
diff --git a/proto/EnterWorldAreaRsp.proto b/proto/EnterWorldAreaRsp.proto
old mode 100644
new mode 100755
index e2cf967..ddba1f0
--- a/proto/EnterWorldAreaRsp.proto
+++ b/proto/EnterWorldAreaRsp.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message EnterWorldAreaRsp {
- uint32 areaType = 2;
- uint32 areaId = 3;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 255;
+ }
+
+ int32 retcode = 1;
+ uint32 area_type = 2;
+ uint32 area_id = 3;
}
diff --git a/proto/EntityAiSyncNotify.proto b/proto/EntityAiSyncNotify.proto
old mode 100644
new mode 100755
index 3e2040d..b2577d9
--- a/proto/EntityAiSyncNotify.proto
+++ b/proto/EntityAiSyncNotify.proto
@@ -5,6 +5,15 @@ option java_package = "emu.grasscutter.net.proto";
import "AiSyncInfo.proto";
message EntityAiSyncNotify {
- repeated AiSyncInfo infoList = 1;
- repeated uint32 localAvatarAlertedMonsterList = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 352;
+ }
+
+ repeated AiSyncInfo info_list = 1;
+ repeated uint32 local_avatar_alerted_monster_list = 2;
}
diff --git a/proto/EntityAuthorityInfo.proto b/proto/EntityAuthorityInfo.proto
old mode 100644
new mode 100755
index aba660f..69c377f
--- a/proto/EntityAuthorityInfo.proto
+++ b/proto/EntityAuthorityInfo.proto
@@ -3,15 +3,15 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AbilitySyncStateInfo.proto";
-import "AnimatorParameterValueInfoPair.proto";
import "EntityRendererChangedInfo.proto";
import "SceneEntityAiInfo.proto";
import "Vector.proto";
+import "AnimatorParameterValueInfoPair.proto";
message EntityAuthorityInfo {
- AbilitySyncStateInfo abilityInfo = 1;
- EntityRendererChangedInfo rendererChangedInfo = 2;
- SceneEntityAiInfo aiInfo = 3;
- Vector bornPos = 4;
- repeated AnimatorParameterValueInfoPair poseParaList = 5;
+ AbilitySyncStateInfo ability_info = 1;
+ EntityRendererChangedInfo renderer_changed_info = 2;
+ SceneEntityAiInfo ai_info = 3;
+ Vector born_pos = 4;
+ repeated AnimatorParameterValueInfoPair pose_para_list = 5;
}
diff --git a/proto/EntityClientData.proto b/proto/EntityClientData.proto
old mode 100644
new mode 100755
index df639c9..50d8cb3
--- a/proto/EntityClientData.proto
+++ b/proto/EntityClientData.proto
@@ -2,8 +2,9 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message EntityClientData {
- uint32 windChangeSceneTime = 1;
- float windmillSyncAngle = 2;
- int32 windChangeTargetLevel = 3;
+ uint32 wind_change_scene_time = 1;
+ float windmill_sync_angle = 2;
+ int32 wind_change_target_level = 3;
}
diff --git a/proto/EntityEnvironmentInfo.proto b/proto/EntityEnvironmentInfo.proto
old mode 100644
new mode 100755
index 37ba467..ebc1912
--- a/proto/EntityEnvironmentInfo.proto
+++ b/proto/EntityEnvironmentInfo.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message EntityEnvironmentInfo {
- uint32 jsonClimateType = 1;
- uint32 climateAreaId = 2;
+ uint32 json_climate_type = 1;
+ uint32 climate_area_id = 2;
}
diff --git a/proto/EntityFightPropChangeReasonNotify.proto b/proto/EntityFightPropChangeReasonNotify.proto
old mode 100644
new mode 100755
index 2bbda06..11dd4f2
--- a/proto/EntityFightPropChangeReasonNotify.proto
+++ b/proto/EntityFightPropChangeReasonNotify.proto
@@ -2,14 +2,24 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "ChangeHpReason.proto";
import "PropChangeReason.proto";
+import "ChangeHpReason.proto";
+import "ChangeEnergyReason.proto";
message EntityFightPropChangeReasonNotify {
- uint32 entityId = 1;
- uint32 propType = 2;
- float propDelta = 3;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1294;
+ }
+
+ uint32 entity_id = 1;
+ uint32 prop_type = 2;
+ float prop_delta = 3;
PropChangeReason reason = 4;
- repeated uint32 paramList = 5;
- ChangeHpReason changeHpReason = 6;
+ repeated uint32 param_list = 5;
+ ChangeHpReason change_hp_reason = 6;
+ ChangeEnergyReason change_energy_reson = 7;
}
diff --git a/proto/EntityFightPropUpdateNotify.proto b/proto/EntityFightPropUpdateNotify.proto
old mode 100644
new mode 100755
index d438a26..bc1fb1d
--- a/proto/EntityFightPropUpdateNotify.proto
+++ b/proto/EntityFightPropUpdateNotify.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message EntityFightPropUpdateNotify {
- uint32 entityId = 1;
- map fightPropMap = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1284;
+ }
+
+ uint32 entity_id = 1;
+ map fight_prop_map = 2;
}
diff --git a/proto/EntityMoveInfo.proto b/proto/EntityMoveInfo.proto
old mode 100644
new mode 100755
index 0085334..69c284f
--- a/proto/EntityMoveInfo.proto
+++ b/proto/EntityMoveInfo.proto
@@ -5,9 +5,9 @@ option java_package = "emu.grasscutter.net.proto";
import "MotionInfo.proto";
message EntityMoveInfo {
- uint32 entityId = 1;
- MotionInfo motionInfo = 2;
- uint32 sceneTime = 3;
- uint32 reliableSeq = 4;
- bool isReliable = 5;
+ uint32 entity_id = 1;
+ MotionInfo motion_info = 2;
+ uint32 scene_time = 3;
+ uint32 reliable_seq = 4;
+ bool is_reliable = 5;
}
diff --git a/proto/EntityPropNotify.proto b/proto/EntityPropNotify.proto
old mode 100644
new mode 100755
index b2175f3..ae9412d
--- a/proto/EntityPropNotify.proto
+++ b/proto/EntityPropNotify.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "PropValue.proto";
message EntityPropNotify {
- uint32 entityId = 1;
- map propMap = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1249;
+ }
+
+ uint32 entity_id = 1;
+ map prop_map = 2;
}
diff --git a/proto/EntityRendererChangedInfo.proto b/proto/EntityRendererChangedInfo.proto
old mode 100644
new mode 100755
index 97141d9..b516139
--- a/proto/EntityRendererChangedInfo.proto
+++ b/proto/EntityRendererChangedInfo.proto
@@ -2,8 +2,9 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message EntityRendererChangedInfo {
- map changedRenderers = 1;
- uint32 visibilityCount = 2;
- bool isCached = 3;
+ map changed_renderers = 1;
+ uint32 visibility_count = 2;
+ bool is_cached = 3;
}
diff --git a/proto/Equip.proto b/proto/Equip.proto
old mode 100644
new mode 100755
index 2c57f6d..edfe05f
--- a/proto/Equip.proto
+++ b/proto/Equip.proto
@@ -6,9 +6,9 @@ import "Reliquary.proto";
import "Weapon.proto";
message Equip {
- oneof detail {
+ oneof Detail {
Reliquary reliquary = 1;
Weapon weapon = 2;
}
- bool isLocked = 3;
+ bool is_locked = 3;
}
diff --git a/proto/EquipParam.proto b/proto/EquipParam.proto
deleted file mode 100644
index 047ce4b..0000000
--- a/proto/EquipParam.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-message EquipParam {
- uint32 itemId = 1;
- uint32 itemNum = 2;
- uint32 itemLevel = 3;
- uint32 PromoteLevel = 4;
-}
diff --git a/proto/EvtAiSyncCombatThreatInfoNotify.proto b/proto/EvtAiSyncCombatThreatInfoNotify.proto
old mode 100644
new mode 100755
index 1ae7079..fb0c690
--- a/proto/EvtAiSyncCombatThreatInfoNotify.proto
+++ b/proto/EvtAiSyncCombatThreatInfoNotify.proto
@@ -5,5 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "AiThreatInfo.proto";
message EvtAiSyncCombatThreatInfoNotify {
- map combatThreatInfoMap = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 373;
+ }
+
+ map combat_threat_info_map = 1;
}
diff --git a/proto/EvtAiSyncSkillCdNotify.proto b/proto/EvtAiSyncSkillCdNotify.proto
old mode 100644
new mode 100755
index 2e33a7c..8cc86fa
--- a/proto/EvtAiSyncSkillCdNotify.proto
+++ b/proto/EvtAiSyncSkillCdNotify.proto
@@ -5,5 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "AiSkillCdInfo.proto";
message EvtAiSyncSkillCdNotify {
- map aiCdMap = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 399;
+ }
+
+ map ai_cd_map = 1;
}
diff --git a/proto/EvtAvatarSitDownNotify.proto b/proto/EvtAvatarSitDownNotify.proto
new file mode 100644
index 0000000..69a42ad
--- /dev/null
+++ b/proto/EvtAvatarSitDownNotify.proto
@@ -0,0 +1,20 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "Vector.proto";
+
+message EvtAvatarSitDownNotify {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 321;
+ }
+
+ uint32 entity_id = 1;
+ Vector position = 2;
+ uint64 chair_id = 3;
+}
diff --git a/proto/EvtAvatarStandUpNotify.proto b/proto/EvtAvatarStandUpNotify.proto
new file mode 100644
index 0000000..ebae8f1
--- /dev/null
+++ b/proto/EvtAvatarStandUpNotify.proto
@@ -0,0 +1,19 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message EvtAvatarStandUpNotify {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 331;
+ }
+
+ uint32 entity_id = 1;
+ int32 direction = 2;
+ int32 perform_i_d = 3;
+ uint64 chair_id = 4;
+}
diff --git a/proto/EvtBeingHitInfo.proto b/proto/EvtBeingHitInfo.proto
old mode 100644
new mode 100755
index cbfbf78..b2e8ec6
--- a/proto/EvtBeingHitInfo.proto
+++ b/proto/EvtBeingHitInfo.proto
@@ -5,6 +5,7 @@ option java_package = "emu.grasscutter.net.proto";
import "AttackResult.proto";
message EvtBeingHitInfo {
- uint32 peerId = 1;
- AttackResult attackResult = 2;
+ uint32 peer_id = 1;
+ AttackResult attack_result = 2;
+ uint32 frame_num = 3;
}
diff --git a/proto/EvtBeingHitNotify.proto b/proto/EvtBeingHitNotify.proto
old mode 100644
new mode 100755
index 5e27f02..0814dfe
--- a/proto/EvtBeingHitNotify.proto
+++ b/proto/EvtBeingHitNotify.proto
@@ -2,10 +2,19 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "EvtBeingHitInfo.proto";
import "ForwardType.proto";
+import "EvtBeingHitInfo.proto";
message EvtBeingHitNotify {
- ForwardType forwardType = 1;
- EvtBeingHitInfo beingHitInfo = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 349;
+ }
+
+ ForwardType forward_type = 1;
+ EvtBeingHitInfo being_hit_info = 2;
}
diff --git a/proto/EvtBeingHitsCombineNotify.proto b/proto/EvtBeingHitsCombineNotify.proto
old mode 100644
new mode 100755
index 40ee673..e6356c1
--- a/proto/EvtBeingHitsCombineNotify.proto
+++ b/proto/EvtBeingHitsCombineNotify.proto
@@ -2,10 +2,19 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "EvtBeingHitInfo.proto";
import "ForwardType.proto";
+import "EvtBeingHitInfo.proto";
message EvtBeingHitsCombineNotify {
- ForwardType forwardType = 1;
- repeated EvtBeingHitInfo evtBeingHitInfoList = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 375;
+ }
+
+ ForwardType forward_type = 1;
+ repeated EvtBeingHitInfo evt_being_hit_info_list = 2;
}
diff --git a/proto/EvtCreateGadgetNotify.proto b/proto/EvtCreateGadgetNotify.proto
old mode 100644
new mode 100755
index ab6eeea..e928fe2
--- a/proto/EvtCreateGadgetNotify.proto
+++ b/proto/EvtCreateGadgetNotify.proto
@@ -6,19 +6,28 @@ import "ForwardType.proto";
import "Vector.proto";
message EvtCreateGadgetNotify {
- ForwardType forwardType = 1;
- uint32 entityId = 2;
- uint32 configId = 3;
- uint32 campId = 4;
- uint32 campType = 5;
- Vector initPos = 6;
- Vector initEulerAngles = 7;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 400;
+ }
+
+ ForwardType forward_type = 1;
+ uint32 entity_id = 2;
+ uint32 config_id = 3;
+ uint32 camp_id = 4;
+ uint32 camp_type = 5;
+ Vector init_pos = 6;
+ Vector init_euler_angles = 7;
uint64 guid = 8;
- uint32 ownerEntityId = 9;
- uint32 targetEntityId = 10;
- bool isAsyncLoad = 11;
- uint32 targetLockPointIndex = 12;
- uint32 roomId = 13;
- uint32 propOwnerEntityId = 14;
- bool sightGroupWithOwner = 15;
+ uint32 owner_entity_id = 9;
+ uint32 target_entity_id = 10;
+ bool is_async_load = 11;
+ uint32 target_lock_point_index = 12;
+ uint32 room_id = 13;
+ uint32 prop_owner_entity_id = 14;
+ bool sight_group_with_owner = 15;
}
diff --git a/proto/EvtDestroyGadgetNotify.proto b/proto/EvtDestroyGadgetNotify.proto
old mode 100644
new mode 100755
index c170861..2fa5970
--- a/proto/EvtDestroyGadgetNotify.proto
+++ b/proto/EvtDestroyGadgetNotify.proto
@@ -5,6 +5,15 @@ option java_package = "emu.grasscutter.net.proto";
import "ForwardType.proto";
message EvtDestroyGadgetNotify {
- ForwardType forwardType = 1;
- uint32 entityId = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 301;
+ }
+
+ ForwardType forward_type = 1;
+ uint32 entity_id = 2;
}
diff --git a/proto/EvtDoSkillSuccNotify.proto b/proto/EvtDoSkillSuccNotify.proto
old mode 100644
new mode 100755
index 6c626a8..235743c
--- a/proto/EvtDoSkillSuccNotify.proto
+++ b/proto/EvtDoSkillSuccNotify.proto
@@ -6,8 +6,17 @@ import "ForwardType.proto";
import "Vector.proto";
message EvtDoSkillSuccNotify {
- ForwardType forwardType = 1;
- uint32 casterId = 2;
- uint32 skillId = 3;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 384;
+ }
+
+ ForwardType forward_type = 1;
+ uint32 caster_id = 2;
+ uint32 skill_id = 3;
Vector forward = 4;
}
diff --git a/proto/EvtHittingOtherInfo.proto b/proto/EvtHittingOtherInfo.proto
old mode 100644
new mode 100755
index f2dce26..27ead05
--- a/proto/EvtHittingOtherInfo.proto
+++ b/proto/EvtHittingOtherInfo.proto
@@ -5,6 +5,6 @@ option java_package = "emu.grasscutter.net.proto";
import "AttackResult.proto";
message EvtHittingOtherInfo {
- uint32 peerId = 1;
- AttackResult attackResult = 2;
+ uint32 peer_id = 1;
+ AttackResult attack_result = 2;
}
diff --git a/proto/FeatureBlockInfo.proto b/proto/FeatureBlockInfo.proto
old mode 100644
new mode 100755
index 8feafc8..d668967
--- a/proto/FeatureBlockInfo.proto
+++ b/proto/FeatureBlockInfo.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message FeatureBlockInfo {
- uint32 featureType = 1;
- uint32 endTime = 2;
+ uint32 feature_type = 1;
+ uint32 end_time = 2;
}
diff --git a/proto/FetterData.proto b/proto/FetterData.proto
old mode 100644
new mode 100755
index 92ea232..7b1b936
--- a/proto/FetterData.proto
+++ b/proto/FetterData.proto
@@ -2,8 +2,9 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message FetterData {
- uint32 fetterId = 1;
- uint32 fetterState = 2;
- repeated uint32 condIndexList = 3;
+ uint32 fetter_id = 1;
+ uint32 fetter_state = 2;
+ repeated uint32 cond_index_list = 3;
}
diff --git a/proto/FetterState.proto b/proto/FetterState.proto
deleted file mode 100644
index 2121d45..0000000
--- a/proto/FetterState.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-enum FetterState {
- NONE = 0;
- NOT_OPEN = 1;
- OPEN = 2;
- FINISH = 3;
-}
diff --git a/proto/FightPropPair.proto b/proto/FightPropPair.proto
old mode 100644
new mode 100755
index fb6f0e3..7c74003
--- a/proto/FightPropPair.proto
+++ b/proto/FightPropPair.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message FightPropPair {
- uint32 type = 1;
- float propValue = 2;
+ uint32 prop_type = 1;
+ float prop_value = 2;
}
diff --git a/proto/FishPoolInfo.proto b/proto/FishPoolInfo.proto
new file mode 100644
index 0000000..4344e5e
--- /dev/null
+++ b/proto/FishPoolInfo.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message FishPoolInfo {
+ uint32 pool_id = 1;
+ repeated uint32 fish_area_list = 2;
+ uint32 today_fish_num = 3;
+}
diff --git a/proto/GetMailItemReq.proto b/proto/ForceUpdateInfo.proto
similarity index 55%
rename from proto/GetMailItemReq.proto
rename to proto/ForceUpdateInfo.proto
index df20fdc..05a95af 100644
--- a/proto/GetMailItemReq.proto
+++ b/proto/ForceUpdateInfo.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-message GetMailItemReq {
- repeated uint32 mailIdList = 1;
+
+message ForceUpdateInfo {
+ string force_update_url = 1;
}
diff --git a/proto/ForwardType.proto b/proto/ForwardType.proto
old mode 100644
new mode 100755
index 329e2ef..b246436
--- a/proto/ForwardType.proto
+++ b/proto/ForwardType.proto
@@ -3,13 +3,13 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum ForwardType {
- ForwardLocal = 0;
- ForwardToAll = 1;
- ForwardToAllExceptCur = 2;
- ForwardToHost = 3;
- ForwardToAllGuest = 4;
- ForwardToPeer = 5;
- ForwardToPeers = 6;
- ForwardOnlyServer = 7;
- ForwardToAllExistExceptCur = 8;
+ FORWARD_LOCAL = 0;
+ FORWARD_TO_ALL = 1;
+ FORWARD_TO_ALL_EXCEPT_CUR = 2;
+ FORWARD_TO_HOST = 3;
+ FORWARD_TO_ALL_GUEST = 4;
+ FORWARD_TO_PEER = 5;
+ FORWARD_TO_PEERS = 6;
+ FORWARD_ONLY_SERVER = 7;
+ FORWARD_TO_ALL_EXIST_EXCEPT_CUR = 8;
}
diff --git a/proto/FoundationInfo.proto b/proto/FoundationInfo.proto
new file mode 100644
index 0000000..f99c2b1
--- /dev/null
+++ b/proto/FoundationInfo.proto
@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "FoundationStatus.proto";
+import "BuildingInfo.proto";
+
+message FoundationInfo {
+ FoundationStatus status = 1;
+ repeated uint32 uid_list = 2;
+ uint32 current_building_id = 3;
+ uint64 begin_build_time_ms = 4;
+ uint32 demolition_refund = 5;
+ repeated BuildingInfo building_list = 6;
+ uint32 current_num = 7;
+ uint32 max_num = 8;
+ uint32 locked_by_uid = 9;
+}
diff --git a/proto/FoundationStatus.proto b/proto/FoundationStatus.proto
new file mode 100644
index 0000000..e53b57b
--- /dev/null
+++ b/proto/FoundationStatus.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+enum FoundationStatus {
+ FOUNDATION_STATUS_NONE = 0;
+ FOUNDATION_STATUS_INIT = 1;
+ FOUNDATION_STATUS_BUILDING = 2;
+ FOUNDATION_STATUS_BUILT = 3;
+}
diff --git a/proto/FriendBrief.proto b/proto/FriendBrief.proto
old mode 100644
new mode 100755
index 9b18192..83b4f4f
--- a/proto/FriendBrief.proto
+++ b/proto/FriendBrief.proto
@@ -2,30 +2,33 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "FriendEnterHomeOption.proto";
import "FriendOnlineState.proto";
-import "HeadImage.proto";
+import "FriendEnterHomeOption.proto";
+import "ProfilePicture.proto";
+import "PlatformType.proto";
import "SocialShowAvatarInfo.proto";
message FriendBrief {
uint32 uid = 1;
string nickname = 2;
uint32 level = 3;
- uint32 worldLevel = 5;
+ uint32 avatar_id = 4;
+ uint32 world_level = 5;
string signature = 6;
- FriendOnlineState onlineState = 7;
+ FriendOnlineState online_state = 7;
uint32 param = 8;
- bool isMpModeAvailable = 10;
- string onlineId = 11;
- uint32 lastActiveTime = 12;
- uint32 nameCardId = 13;
- uint32 mpPlayerNum = 14;
- bool isChatNoDisturb = 15;
- uint32 chatSequence = 16;
- string remarkName = 17;
- repeated SocialShowAvatarInfo showAvatarInfoList = 22;
- FriendEnterHomeOption friendEnterHomeOption = 23;
- HeadImage avatar = 24;
- uint32 unk1 = 25;
- uint32 unk2 = 27;
+ bool is_mp_mode_available = 10;
+ string online_id = 11;
+ uint32 last_active_time = 12;
+ uint32 name_card_id = 13;
+ uint32 mp_player_num = 14;
+ bool is_chat_no_disturb = 15;
+ uint32 chat_sequence = 16;
+ string remark_name = 17;
+ repeated SocialShowAvatarInfo show_avatar_info_list = 22;
+ FriendEnterHomeOption friend_enter_home_option = 23;
+ ProfilePicture profile_picture = 24;
+ bool is_game_source = 25;
+ bool is_psn_source = 26;
+ PlatformType platform_type = 27;
}
diff --git a/proto/FriendEnterHomeOption.proto b/proto/FriendEnterHomeOption.proto
old mode 100644
new mode 100755
index 2e3e6af..3aa2bd7
--- a/proto/FriendEnterHomeOption.proto
+++ b/proto/FriendEnterHomeOption.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum FriendEnterHomeOption {
- NeedConfirm = 0;
- Refuse = 1;
- Direct = 2;
+ NEED_CONFIRM = 0;
+ REFUSE = 1;
+ DIRECT = 2;
}
diff --git a/proto/FriendOnlineState.proto b/proto/FriendOnlineState.proto
old mode 100644
new mode 100755
index ea1f2ba..0c08222
--- a/proto/FriendOnlineState.proto
+++ b/proto/FriendOnlineState.proto
@@ -3,6 +3,6 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum FriendOnlineState {
- FRIEND_DISCONNECT = 0;
+ FREIEND_DISCONNECT = 0;
FRIEND_ONLINE = 1;
}
diff --git a/proto/Furniture.proto b/proto/Furniture.proto
old mode 100644
new mode 100755
index dc4a2a3..ba058d8
--- a/proto/Furniture.proto
+++ b/proto/Furniture.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message Furniture {
uint32 count = 1;
}
diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto
old mode 100644
new mode 100755
index 5399ab7..ebf25b0
--- a/proto/GachaInfo.proto
+++ b/proto/GachaInfo.proto
@@ -26,4 +26,4 @@ message GachaInfo {
string gachaTitlePath = 19;
repeated uint32 mainNameId = 20;
repeated uint32 subNameId = 21;
-}
+}
\ No newline at end of file
diff --git a/proto/GachaItem.proto b/proto/GachaItem.proto
old mode 100644
new mode 100755
index 7b39a99..a2d73af
--- a/proto/GachaItem.proto
+++ b/proto/GachaItem.proto
@@ -2,13 +2,13 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "GachaTransferItem.proto";
import "ItemParam.proto";
+import "GachaTransferItem.proto";
message GachaItem {
- ItemParam gachaItem = 1;
- repeated GachaTransferItem transferItems = 2;
- bool isFlashCard = 3;
- bool isGachaItemNew = 4;
- repeated ItemParam tokenItemList = 5;
+ ItemParam gacha_item_ = 1;
+ repeated GachaTransferItem transfer_items = 2;
+ bool is_flash_card = 3;
+ bool is_gacha_item_new = 4;
+ repeated ItemParam token_item_list = 5;
}
diff --git a/proto/GachaTransferItem.proto b/proto/GachaTransferItem.proto
old mode 100644
new mode 100755
index 715339d..5de8c22
--- a/proto/GachaTransferItem.proto
+++ b/proto/GachaTransferItem.proto
@@ -6,5 +6,5 @@ import "ItemParam.proto";
message GachaTransferItem {
ItemParam item = 1;
- bool isTransferItemNew = 2;
+ bool is_transfer_item_new = 2;
}
diff --git a/proto/GachaUpInfo.proto b/proto/GachaUpInfo.proto
old mode 100644
new mode 100755
index df195cf..37d1873
--- a/proto/GachaUpInfo.proto
+++ b/proto/GachaUpInfo.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message GachaUpInfo {
- uint32 itemParentType = 1;
- repeated uint32 itemIdList = 2;
+ uint32 item_parent_type = 1;
+ repeated uint32 item_id_list = 2;
}
diff --git a/proto/GadgetBornType.proto b/proto/GadgetBornType.proto
old mode 100644
new mode 100755
index beddb85..c20baa4
--- a/proto/GadgetBornType.proto
+++ b/proto/GadgetBornType.proto
@@ -3,11 +3,11 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum GadgetBornType {
- GadgetBornNone = 0;
- GadgetBornInAir = 1;
- GadgetBornPlayer = 2;
- GadgetBornMonsterHit = 3;
- GadgetBornMonsterDie = 4;
- GadgetBornGadget = 5;
- GadgetBornGround = 6;
+ GADGET_BORN_NONE = 0;
+ GADGET_BORN_IN_AIR = 1;
+ GADGET_BORN_PLAYER = 2;
+ GADGET_BORN_MONSTER_HIT = 3;
+ GADGET_BORN_MONSTER_DIE = 4;
+ GADGET_BORN_GADGET = 5;
+ GADGET_BORN_GROUND = 6;
}
diff --git a/proto/GadgetClientParam.proto b/proto/GadgetClientParam.proto
old mode 100644
new mode 100755
diff --git a/proto/GadgetCrucibleInfo.proto b/proto/GadgetCrucibleInfo.proto
old mode 100644
new mode 100755
index 766e455..3fbbced
--- a/proto/GadgetCrucibleInfo.proto
+++ b/proto/GadgetCrucibleInfo.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-message GadgetCrucibleInfo {
+message GadgetCrucibleInfo {
+ uint32 mp_play_id = 1;
+ uint32 prepare_end_time = 2;
}
diff --git a/proto/GadgetGeneralRewardInfo.proto b/proto/GadgetGeneralRewardInfo.proto
new file mode 100644
index 0000000..42d9d02
--- /dev/null
+++ b/proto/GadgetGeneralRewardInfo.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "ItemParam.proto";
+
+message GadgetGeneralRewardInfo {
+ uint32 resin = 1;
+ uint32 dead_time = 2;
+ repeated uint32 remain_uid_list = 3;
+ repeated uint32 qualify_uid_list = 4;
+ ItemParam item_param = 5;
+}
diff --git a/proto/GadgetInteractReq.proto b/proto/GadgetInteractReq.proto
old mode 100644
new mode 100755
index fb3df42..540f192
--- a/proto/GadgetInteractReq.proto
+++ b/proto/GadgetInteractReq.proto
@@ -6,9 +6,18 @@ import "InterOpType.proto";
import "ResinCostType.proto";
message GadgetInteractReq {
- uint32 gadgetEntityId = 1;
- InterOpType opType = 2;
- uint32 gadgetId = 3;
- bool isUseCondenseResin = 4;
- ResinCostType resinCostType = 5;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 849;
+ }
+
+ uint32 gadget_entity_id = 1;
+ InterOpType op_type = 2;
+ uint32 gadget_id = 3;
+ bool is_use_condense_resin = 4;
+ ResinCostType resin_cost_type = 5;
}
diff --git a/proto/GadgetInteractRsp.proto b/proto/GadgetInteractRsp.proto
old mode 100644
new mode 100755
index c08161b..1c500d8
--- a/proto/GadgetInteractRsp.proto
+++ b/proto/GadgetInteractRsp.proto
@@ -2,13 +2,21 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "InterOpType.proto";
import "InteractType.proto";
+import "InterOpType.proto";
message GadgetInteractRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 818;
+ }
+
int32 retcode = 1;
- uint32 gadgetEntityId = 2;
- InteractType interactType = 3;
- InterOpType opType = 4;
- uint32 gadgetId = 5;
+ uint32 gadget_entity_id = 2;
+ InteractType interact_type = 3;
+ InterOpType op_type = 4;
+ uint32 gadget_id = 5;
}
diff --git a/proto/GadgetPlayInfo.proto b/proto/GadgetPlayInfo.proto
old mode 100644
new mode 100755
index 28fe9a7..2ad76e2
--- a/proto/GadgetPlayInfo.proto
+++ b/proto/GadgetPlayInfo.proto
@@ -5,13 +5,13 @@ option java_package = "emu.grasscutter.net.proto";
import "GadgetCrucibleInfo.proto";
message GadgetPlayInfo {
- uint32 playType = 1;
- uint32 duration = 2;
- repeated uint32 progressStageList = 3;
- uint32 startCd = 4;
- uint32 startTime = 5;
- uint32 progress = 6;
- oneof playInfo {
- GadgetCrucibleInfo crucibleInfo = 21;
+ oneof PlayInfo {
+ GadgetCrucibleInfo crucible_info = 21;
}
+ uint32 play_type = 1;
+ uint32 duration = 2;
+ repeated uint32 progress_stage_list = 3;
+ uint32 start_cd = 4;
+ uint32 start_time = 5;
+ uint32 progress = 6;
}
diff --git a/proto/GatherGadgetInfo.proto b/proto/GatherGadgetInfo.proto
new file mode 100644
index 0000000..2c24269
--- /dev/null
+++ b/proto/GatherGadgetInfo.proto
@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message GatherGadgetInfo {
+ uint32 item_id = 1;
+ bool is_forbid_guest = 2;
+}
diff --git a/proto/GetActivityInfoRsp.proto b/proto/GetActivityInfoRsp.proto
old mode 100644
new mode 100755
index e44903a..6da523f
--- a/proto/GetActivityInfoRsp.proto
+++ b/proto/GetActivityInfoRsp.proto
@@ -3,9 +3,19 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "ActivityInfo.proto";
+import "Uint32Pair.proto";
message GetActivityInfoRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 2011;
+ }
+
int32 retcode = 1;
- repeated ActivityInfo activityInfoList = 2;
- repeated uint32 activatedSaleIdList = 3;
+ repeated ActivityInfo activity_info_list = 2;
+ repeated uint32 activated_sale_id_list = 3;
+ repeated Uint32Pair disable_transfer_point_interaction_list = 4;
}
diff --git a/proto/GetAllMailRsp.proto b/proto/GetAllMailRsp.proto
deleted file mode 100644
index 6c7d7f3..0000000
--- a/proto/GetAllMailRsp.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-import "MailData.proto";
-
-message GetAllMailRsp {
- int32 retcode = 1;
- repeated MailData mailList = 2;
- bool isTruncated = 3;
-}
diff --git a/proto/GetAllUnlockNameCardRsp.proto b/proto/GetAllUnlockNameCardRsp.proto
old mode 100644
new mode 100755
index 1a93350..aaf1338
--- a/proto/GetAllUnlockNameCardRsp.proto
+++ b/proto/GetAllUnlockNameCardRsp.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message GetAllUnlockNameCardRsp {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 4076;
+ }
+
int32 retcode = 1;
- repeated uint32 nameCardList = 2;
+ repeated uint32 name_card_list = 2;
}
diff --git a/proto/GetAuthkeyReq.proto b/proto/GetAuthkeyReq.proto
old mode 100644
new mode 100755
index f4c212c..8816c81
--- a/proto/GetAuthkeyReq.proto
+++ b/proto/GetAuthkeyReq.proto
@@ -2,8 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message GetAuthkeyReq {
- string authAppid = 1;
- uint32 signType = 2;
- uint32 authkeyVer = 3;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1442;
+ }
+
+ string auth_appid = 1;
+ uint32 sign_type = 2;
+ uint32 authkey_ver = 3;
}
diff --git a/proto/GetAuthkeyRsp.proto b/proto/GetAuthkeyRsp.proto
old mode 100644
new mode 100755
index 584251a..35c1aee
--- a/proto/GetAuthkeyRsp.proto
+++ b/proto/GetAuthkeyRsp.proto
@@ -2,11 +2,20 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message GetAuthkeyRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1461;
+ }
+
int32 retcode = 1;
string authkey = 2;
- string authAppid = 3;
- uint32 signType = 4;
- uint32 authkeyVer = 5;
- string gameBiz = 6;
+ string auth_appid = 3;
+ uint32 sign_type = 4;
+ uint32 authkey_ver = 5;
+ string game_biz = 6;
}
diff --git a/proto/GetGachaInfoRsp.proto b/proto/GetGachaInfoRsp.proto
old mode 100644
new mode 100755
index c275f56..0aca2e4
--- a/proto/GetGachaInfoRsp.proto
+++ b/proto/GetGachaInfoRsp.proto
@@ -5,7 +5,15 @@ option java_package = "emu.grasscutter.net.proto";
import "GachaInfo.proto";
message GetGachaInfoRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1518;
+ }
+
int32 retcode = 1;
- repeated GachaInfo gachaInfoList = 2;
- uint32 gachaRandom = 3;
+ repeated GachaInfo gacha_info_list = 2;
+ uint32 gacha_random = 3;
}
diff --git a/proto/GetMailItemRsp.proto b/proto/GetMailItemRsp.proto
deleted file mode 100644
index 4eb3017..0000000
--- a/proto/GetMailItemRsp.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-import "EquipParam.proto";
-
-message GetMailItemRsp {
- int32 retcode = 1;
- repeated uint32 mailIdList = 2;
- repeated EquipParam itemList = 3;
-}
diff --git a/proto/GetPlayerAskFriendListRsp.proto b/proto/GetPlayerAskFriendListRsp.proto
old mode 100644
new mode 100755
index c783f38..c3cfe92
--- a/proto/GetPlayerAskFriendListRsp.proto
+++ b/proto/GetPlayerAskFriendListRsp.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "FriendBrief.proto";
message GetPlayerAskFriendListRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 4005;
+ }
+
int32 retcode = 1;
- repeated FriendBrief askFriendList = 2;
+ repeated FriendBrief ask_friend_list = 2;
}
diff --git a/proto/GetPlayerBlacklistRsp.proto b/proto/GetPlayerBlacklistRsp.proto
old mode 100644
new mode 100755
index 979e983..6a6966a
--- a/proto/GetPlayerBlacklistRsp.proto
+++ b/proto/GetPlayerBlacklistRsp.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "FriendBrief.proto";
message GetPlayerBlacklistRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 4020;
+ }
+
int32 retcode = 1;
repeated FriendBrief blacklist = 2;
}
diff --git a/proto/GetPlayerFriendListRsp.proto b/proto/GetPlayerFriendListRsp.proto
old mode 100644
new mode 100755
index 95f8c5e..044f3bc
--- a/proto/GetPlayerFriendListRsp.proto
+++ b/proto/GetPlayerFriendListRsp.proto
@@ -5,7 +5,16 @@ option java_package = "emu.grasscutter.net.proto";
import "FriendBrief.proto";
message GetPlayerFriendListRsp {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 4018;
+ }
+
int32 retcode = 1;
- repeated FriendBrief friendList = 2;
- repeated FriendBrief askFriendList = 3;
+ repeated FriendBrief friend_list = 2;
+ repeated FriendBrief ask_friend_list = 3;
}
diff --git a/proto/GetPlayerSocialDetailReq.proto b/proto/GetPlayerSocialDetailReq.proto
old mode 100644
new mode 100755
index 4905426..c0a4bc4
--- a/proto/GetPlayerSocialDetailReq.proto
+++ b/proto/GetPlayerSocialDetailReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message GetPlayerSocialDetailReq {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 4061;
+ }
+
uint32 uid = 1;
}
diff --git a/proto/GetPlayerSocialDetailRsp.proto b/proto/GetPlayerSocialDetailRsp.proto
old mode 100644
new mode 100755
index 95d9e89..6ef02e8
--- a/proto/GetPlayerSocialDetailRsp.proto
+++ b/proto/GetPlayerSocialDetailRsp.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "SocialDetail.proto";
message GetPlayerSocialDetailRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 4079;
+ }
+
int32 retcode = 1;
- SocialDetail detailData = 2;
+ SocialDetail detail_data = 2;
}
diff --git a/proto/GetPlayerTokenReq.proto b/proto/GetPlayerTokenReq.proto
old mode 100644
new mode 100755
index 083a030..f43d00d
--- a/proto/GetPlayerTokenReq.proto
+++ b/proto/GetPlayerTokenReq.proto
@@ -2,10 +2,30 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message GetPlayerTokenReq {
- uint32 accountType = 1;
- string accountUid = 2;
- string accountToken = 3;
- uint64 platformType = 7;
- uint64 schannelId = 11;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 149;
+ }
+
+ uint32 account_type = 1;
+ string account_uid = 2;
+ string account_token = 3;
+ string account_ext = 4;
+ uint32 uid = 5;
+ bool is_guest = 6;
+ uint32 platform_type = 7;
+ uint32 cloud_client_ip = 8;
+ string online_id = 9;
+ string psn_region = 10;
+ uint32 channel_id = 11;
+ uint32 sub_channel_id = 12;
+ string country_code = 13;
+ string psn_id = 14;
+ string client_ip_str = 15;
}
diff --git a/proto/GetPlayerTokenRsp.proto b/proto/GetPlayerTokenRsp.proto
old mode 100644
new mode 100755
index 011e500..d48a666
--- a/proto/GetPlayerTokenRsp.proto
+++ b/proto/GetPlayerTokenRsp.proto
@@ -2,18 +2,38 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message GetPlayerTokenRsp {
- uint32 playerUid = 3;
- string accountToken = 4;
- int32 accountType = 6;
- bool isProficientPlayer = 8;
- uint32 gmUid = 10;
- uint64 secretKey = 11;
- bytes secretKeyBuffer = 12;
- uint64 platformType = 13;
- uint32 channelId = 16;
- string countryCode = 19;
- string unk1 = 22;
- uint32 unk3 = 23;
- string clientIp = 24;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 118;
+ }
+
+ int32 retcode = 1;
+ string msg = 2;
+ uint32 uid = 3;
+ string token = 4;
+ uint32 black_uid_end_time = 5;
+ uint32 account_type = 6;
+ string account_uid = 7;
+ bool is_proficient_player = 8;
+ string secret_key = 9;
+ uint32 gm_uid = 10;
+ uint64 secret_key_seed = 11;
+ bytes security_cmd_buffer = 12;
+ uint32 platform_type = 13;
+ bytes extra_bin_data = 14;
+ bool is_guest = 15;
+ uint32 channel_id = 16;
+ uint32 sub_channel_id = 17;
+ uint32 tag = 18;
+ string country_code = 19;
+ bool is_login_white_list = 20;
+ string psn_id = 21;
+ string client_version_random_key = 22;
+ uint32 reg_platform = 23;
+ string client_ip_str = 24;
}
diff --git a/proto/GetSceneAreaReq.proto b/proto/GetSceneAreaReq.proto
old mode 100644
new mode 100755
index c664836..9ff7367
--- a/proto/GetSceneAreaReq.proto
+++ b/proto/GetSceneAreaReq.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message GetSceneAreaReq {
- uint32 sceneId = 1;
- uint32 belongUid = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 206;
+ }
+
+ uint32 scene_id = 1;
+ uint32 belong_uid = 2;
}
diff --git a/proto/GetSceneAreaRsp.proto b/proto/GetSceneAreaRsp.proto
old mode 100644
new mode 100755
index b25ae29..c71a0eb
--- a/proto/GetSceneAreaRsp.proto
+++ b/proto/GetSceneAreaRsp.proto
@@ -5,8 +5,16 @@ option java_package = "emu.grasscutter.net.proto";
import "CityInfo.proto";
message GetSceneAreaRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 216;
+ }
+
int32 retcode = 1;
- uint32 sceneId = 2;
- repeated uint32 areaIdList = 3;
- repeated CityInfo cityInfoList = 4;
+ uint32 scene_id = 2;
+ repeated uint32 area_id_list = 3;
+ repeated CityInfo city_info_list = 4;
}
diff --git a/proto/GetScenePointReq.proto b/proto/GetScenePointReq.proto
old mode 100644
new mode 100755
index 42538a4..d031cdf
--- a/proto/GetScenePointReq.proto
+++ b/proto/GetScenePointReq.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message GetScenePointReq {
- uint32 sceneId = 1;
- uint32 belongUid = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 291;
+ }
+
+ uint32 scene_id = 1;
+ uint32 belong_uid = 2;
}
diff --git a/proto/GetScenePointRsp.proto b/proto/GetScenePointRsp.proto
old mode 100644
new mode 100755
index 7973829..135ff2a
--- a/proto/GetScenePointRsp.proto
+++ b/proto/GetScenePointRsp.proto
@@ -2,15 +2,25 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message GetScenePointRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 236;
+ }
+
int32 retcode = 1;
- uint32 sceneId = 2;
- repeated uint32 unlockedPointList = 3;
- uint32 belongUid = 4;
- repeated uint32 unlockAreaList = 5;
- repeated uint32 lockedPointList = 6;
- repeated uint32 toBeExploreDungeonEntryList = 7;
- repeated uint32 notExploredDungeonEntryList = 8;
- repeated uint32 groupUnlimitPointList = 9;
- repeated uint32 notInteractDungeonEntryList = 10;
+ uint32 scene_id = 2;
+ repeated uint32 unlocked_point_list = 3;
+ uint32 belong_uid = 4;
+ repeated uint32 unlock_area_list = 5;
+ repeated uint32 locked_point_list = 6;
+ repeated uint32 to_be_explore_dungeon_entry_list = 7;
+ repeated uint32 not_explored_dungeon_entry_list = 8;
+ repeated uint32 group_unlimit_point_list = 9;
+ repeated uint32 not_interact_dungeon_entry_list = 10;
+ repeated uint32 hide_point_list = 11;
}
diff --git a/proto/GetShopReq.proto b/proto/GetShopReq.proto
old mode 100644
new mode 100755
index 298e6c0..66d4a31
--- a/proto/GetShopReq.proto
+++ b/proto/GetShopReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message GetShopReq {
- uint32 shopType = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 749;
+ }
+
+ uint32 shop_type = 1;
}
diff --git a/proto/GetShopRsp.proto b/proto/GetShopRsp.proto
old mode 100644
new mode 100755
index e7295dc..9945083
--- a/proto/GetShopRsp.proto
+++ b/proto/GetShopRsp.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "Shop.proto";
message GetShopRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 718;
+ }
+
int32 retcode = 1;
Shop shop = 2;
}
diff --git a/proto/GetShopmallDataRsp.proto b/proto/GetShopmallDataRsp.proto
old mode 100644
new mode 100755
index 6db6d68..e2b8e61
--- a/proto/GetShopmallDataRsp.proto
+++ b/proto/GetShopmallDataRsp.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message GetShopmallDataRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 701;
+ }
+
int32 retcode = 1;
- repeated uint32 shopTypeList = 2;
+ repeated uint32 shop_type_list = 2;
}
diff --git a/proto/GetWorldMpInfoRsp.proto b/proto/GetWorldMpInfoRsp.proto
old mode 100644
new mode 100755
index c4bebe7..4e6faff
--- a/proto/GetWorldMpInfoRsp.proto
+++ b/proto/GetWorldMpInfoRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message GetWorldMpInfoRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 3394;
+ }
+
int32 retcode = 1;
- bool isInMpMode = 2;
- uint32 quitMpValidTime = 3;
+ bool is_in_mp_mode = 2;
+ uint32 quit_mp_valid_time = 3;
}
diff --git a/proto/H5ActivityIdsNotify.proto b/proto/H5ActivityIdsNotify.proto
old mode 100644
new mode 100755
index 59521ed..1cd25d2
--- a/proto/H5ActivityIdsNotify.proto
+++ b/proto/H5ActivityIdsNotify.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message H5ActivityIdsNotify {
- map h5ActivityMap = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 5677;
+ }
+
+ map h5_activity_map = 1;
+ uint32 client_red_dot_timestamp = 2;
}
diff --git a/proto/HeadImage.proto b/proto/HeadImage.proto
old mode 100644
new mode 100755
diff --git a/proto/HitColliderType.proto b/proto/HitColliderType.proto
old mode 100644
new mode 100755
index e064487..6c04a4a
--- a/proto/HitColliderType.proto
+++ b/proto/HitColliderType.proto
@@ -3,8 +3,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum HitColliderType {
- HitColliderInvalid = 0;
- HitColliderHitBox = 1;
- HitColliderWetHitBox = 2;
- HitColliderHeadBox = 3;
+ HIT_COLLIDER_INVALID = 0;
+ HIT_COLLIDER_HIT_BOX = 1;
+ HIT_COLLIDER_WET_HIT_BOX = 2;
+ HIT_COLLIDER_HEAD_BOX = 3;
}
diff --git a/proto/HitCollision.proto b/proto/HitCollision.proto
old mode 100644
new mode 100755
index b3766b0..939a0e1
--- a/proto/HitCollision.proto
+++ b/proto/HitCollision.proto
@@ -6,10 +6,10 @@ import "HitColliderType.proto";
import "Vector.proto";
message HitCollision {
- HitColliderType hitColliderType = 1;
- int32 hitBoxIndex = 2;
- Vector hitPoint = 3;
- Vector hitDir = 4;
- float attackeeHitForceAngle = 5;
- float attackeeHitEntityAngle = 6;
+ HitColliderType hit_collider_type = 1;
+ int32 hit_box_index = 2;
+ Vector hit_point = 3;
+ Vector hit_dir = 4;
+ float attackee_hit_force_angle = 5;
+ float attackee_hit_entity_angle = 6;
}
diff --git a/proto/HostPlayerNotify.proto b/proto/HostPlayerNotify.proto
old mode 100644
new mode 100755
index 2659edc..39127be
--- a/proto/HostPlayerNotify.proto
+++ b/proto/HostPlayerNotify.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message HostPlayerNotify {
- uint32 hostUid = 1;
- uint32 hostPeerId = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 389;
+ }
+
+ uint32 host_uid = 1;
+ uint32 host_peer_id = 2;
}
diff --git a/proto/InterOpType.proto b/proto/InterOpType.proto
old mode 100644
new mode 100755
index 9ccecdb..7911091
--- a/proto/InterOpType.proto
+++ b/proto/InterOpType.proto
@@ -3,6 +3,6 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum InterOpType {
- InterOpFinish = 0;
- InterOpStart = 1;
+ INTER_OP_FINISH = 0;
+ INTER_OP_START = 1;
}
diff --git a/proto/InteractType.proto b/proto/InteractType.proto
old mode 100644
new mode 100755
index 6883ad3..cadaf32
--- a/proto/InteractType.proto
+++ b/proto/InteractType.proto
@@ -3,15 +3,19 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum InteractType {
- InteractNone = 0;
- InteractPickItem = 1;
- InteractGather = 2;
- InteractOpenChest = 3;
- InteractOpenStatue = 4;
- InteractConsum = 5;
- InteractMpPlayReward = 6;
- InteractView = 7;
- InteractGeneralReward = 8;
- InteractMiracleRing = 9;
- InteractFoundation = 10;
+ INTERACT_NONE = 0;
+ INTERACT_PICK_ITEM = 1;
+ INTERACT_GATHER = 2;
+ INTERACT_OPEN_CHEST = 3;
+ INTERACT_OPEN_STATUE = 4;
+ INTERACT_CONSUM = 5;
+ INTERACT_MP_PLAY_REWARD = 6;
+ INTERACT_VIEW = 7;
+ INTERACT_GENERAL_REWARD = 8;
+ INTERACT_MIRACLE_RING = 9;
+ INTERACT_FOUNDATION = 10;
+ INTERACT_ECHO_SHELL = 11;
+ INTERACT_HOME_GATHER = 12;
+ INTERACT_ENV_ANIMAL = 13;
+ INTERACT_QUEST_GADGET = 14;
}
diff --git a/proto/Item.proto b/proto/Item.proto
old mode 100644
new mode 100755
index f0857be..98f8098
--- a/proto/Item.proto
+++ b/proto/Item.proto
@@ -2,16 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+import "Material.proto";
import "Equip.proto";
import "Furniture.proto";
-import "Material.proto";
message Item {
- uint32 itemId = 1;
- uint64 guid = 2;
- oneof detail {
+ oneof Detail {
Material material = 5;
Equip equip = 6;
Furniture furniture = 7;
}
+ uint32 item_id = 1;
+ uint64 guid = 2;
}
diff --git a/proto/ItemAddHintNotify.proto b/proto/ItemAddHintNotify.proto
old mode 100644
new mode 100755
index ea4db2f..c9b5be1
--- a/proto/ItemAddHintNotify.proto
+++ b/proto/ItemAddHintNotify.proto
@@ -2,15 +2,24 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "ItemHint.proto";
import "Vector.proto";
+import "ItemHint.proto";
message ItemAddHintNotify {
- repeated ItemHint itemList = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 700;
+ }
+
+ repeated ItemHint item_list = 1;
Vector position = 2;
- bool isPositionValid = 3;
+ bool is_position_valid = 3;
uint32 reason = 4;
- uint32 questId = 5;
- bool isTransferedFromAvatarCard = 6;
- repeated ItemHint overflowTransformedItemList = 7;
+ uint32 quest_id = 5;
+ bool is_transfered_from_avatar_card = 6;
+ repeated ItemHint overflow_transformed_item_list = 7;
+ bool is_general_reward_hiden = 8;
}
diff --git a/proto/ItemExceedLimitNotify.proto b/proto/ItemExceedLimitNotify.proto
old mode 100644
new mode 100755
diff --git a/proto/ItemGivingReq.proto b/proto/ItemGivingReq.proto
old mode 100644
new mode 100755
index f09b8c9..562e2ea
--- a/proto/ItemGivingReq.proto
+++ b/proto/ItemGivingReq.proto
@@ -5,7 +5,16 @@ option java_package = "emu.grasscutter.net.proto";
import "ItemParam.proto";
message ItemGivingReq {
- uint32 givingId = 1;
- repeated ItemParam itemParamList = 2;
- map itemGuidCountMap = 3;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 187;
+ }
+
+ uint32 giving_id = 1;
+ repeated ItemParam item_param_list = 2;
+ map item_guid_count_map = 3;
}
diff --git a/proto/ItemGivingRsp.proto b/proto/ItemGivingRsp.proto
old mode 100644
new mode 100755
index ea3694b..ac5d6f6
--- a/proto/ItemGivingRsp.proto
+++ b/proto/ItemGivingRsp.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ItemGivingRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 141;
+ }
+
int32 retcode = 1;
- uint32 givingId = 2;
+ uint32 giving_id = 2;
}
diff --git a/proto/ItemHint.proto b/proto/ItemHint.proto
old mode 100644
new mode 100755
index 2d03617..5409b46
--- a/proto/ItemHint.proto
+++ b/proto/ItemHint.proto
@@ -2,8 +2,9 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ItemHint {
- uint32 itemId = 1;
+ uint32 item_id = 1;
uint32 count = 2;
- bool isNew = 3;
+ bool is_new = 3;
}
diff --git a/proto/ItemParam.proto b/proto/ItemParam.proto
old mode 100644
new mode 100755
index 2e48028..10b7572
--- a/proto/ItemParam.proto
+++ b/proto/ItemParam.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ItemParam {
- uint32 itemId = 1;
+ uint32 item_id = 1;
uint32 count = 2;
}
diff --git a/proto/LifeStateChangeNotify.proto b/proto/LifeStateChangeNotify.proto
old mode 100644
new mode 100755
index 4f16e93..076b276
--- a/proto/LifeStateChangeNotify.proto
+++ b/proto/LifeStateChangeNotify.proto
@@ -3,12 +3,22 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "PlayerDieType.proto";
+import "ServerBuff.proto";
message LifeStateChangeNotify {
- uint32 entityId = 1;
- uint32 lifeState = 2;
- uint32 sourceEntityId = 3;
- string attackTag = 4;
- PlayerDieType dieType = 5;
- uint32 moveReliableSeq = 6;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1218;
+ }
+
+ uint32 entity_id = 1;
+ uint32 life_state = 2;
+ uint32 source_entity_id = 3;
+ string attack_tag = 4;
+ PlayerDieType die_type = 5;
+ uint32 move_reliable_seq = 6;
+ repeated ServerBuff server_buff_list = 7;
}
diff --git a/proto/MPLevelEntityInfo.proto b/proto/MPLevelEntityInfo.proto
old mode 100644
new mode 100755
index 810e1d3..25b79c6
--- a/proto/MPLevelEntityInfo.proto
+++ b/proto/MPLevelEntityInfo.proto
@@ -5,7 +5,7 @@ option java_package = "emu.grasscutter.net.proto";
import "AbilitySyncStateInfo.proto";
message MPLevelEntityInfo {
- uint32 entityId = 1;
- uint32 authorityPeerId = 2;
- AbilitySyncStateInfo abilityInfo = 3;
+ uint32 entity_id = 1;
+ uint32 authority_peer_id = 2;
+ AbilitySyncStateInfo ability_info = 3;
}
diff --git a/proto/MailChangeNotify.proto b/proto/MailChangeNotify.proto
deleted file mode 100644
index 0fe80b2..0000000
--- a/proto/MailChangeNotify.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-import "MailData.proto";
-
-message MailChangeNotify {
- repeated MailData mailList = 1;
- repeated uint32 delMailIdList = 2;
-}
diff --git a/proto/MailData.proto b/proto/MailData.proto
deleted file mode 100644
index fe74217..0000000
--- a/proto/MailData.proto
+++ /dev/null
@@ -1,20 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-import "MailTextContent.proto";
-import "MailItem.proto";
-
-message MailData {
- uint32 mailId = 1;
- MailTextContent mailTextContent = 4;
- repeated MailItem itemList = 7;
- uint32 sendTime = 8;
- uint32 expireTime = 9;
- uint32 importance = 10;
- bool isRead = 11;
- bool isAttachmentGot = 12;
- uint32 configId = 13;
- repeated string argumentList = 14;
- uint32 stateValue = 15;
-}
diff --git a/proto/MailItem.proto b/proto/MailItem.proto
deleted file mode 100644
index 72bcb8e..0000000
--- a/proto/MailItem.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-import "ItemParam.proto";
-import "MaterialDeleteInfo.proto";
-
-message MailItem {
- ItemParam itemParam = 1;
- MaterialDeleteInfo deleteInfo = 2;
-}
diff --git a/proto/MailTextContent.proto b/proto/MailTextContent.proto
deleted file mode 100644
index 097710f..0000000
--- a/proto/MailTextContent.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-message MailTextContent {
- string title = 1;
- string content = 2;
- string sender = 3;
-}
diff --git a/proto/MapMarkFromType.proto b/proto/MapMarkFromType.proto
old mode 100644
new mode 100755
index 5d31e1a..1dcbc0a
--- a/proto/MapMarkFromType.proto
+++ b/proto/MapMarkFromType.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum MapMarkFromType {
- None = 0;
- MonsterType = 1;
- QuestType = 2;
+ NOE = 0;
+ MONSTER = 1;
+ QUEST = 2;
}
diff --git a/proto/MapMarkPoint.proto b/proto/MapMarkPoint.proto
old mode 100644
new mode 100755
index fb244db..2a615d4
--- a/proto/MapMarkPoint.proto
+++ b/proto/MapMarkPoint.proto
@@ -2,16 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "MapMarkFromType.proto";
-import "MapMarkPointType.proto";
import "Vector.proto";
+import "MapMarkPointType.proto";
+import "MapMarkFromType.proto";
message MapMarkPoint {
- uint32 sceneId = 1;
+ uint32 scene_id = 1;
string name = 2;
Vector pos = 3;
- MapMarkPointType pointType = 4;
- uint32 monsterId = 5;
- MapMarkFromType fromType = 6;
- uint32 questId = 7;
+ MapMarkPointType point_type = 4;
+ uint32 monster_id = 5;
+ MapMarkFromType from_type = 6;
+ uint32 quest_id = 7;
}
diff --git a/proto/MapMarkPointType.proto b/proto/MapMarkPointType.proto
old mode 100644
new mode 100755
index 986d308..bce93da
--- a/proto/MapMarkPointType.proto
+++ b/proto/MapMarkPointType.proto
@@ -3,10 +3,11 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum MapMarkPointType {
- Npc = 0;
- Quest = 1;
- Special = 2;
- Mine = 3;
- Collection = 4;
- Monster = 5;
+ MAP_MARK_POINT_TYPE_NPC = 0;
+ MAP_MARK_POINT_TYPE_QUEST = 1;
+ MAP_MARK_POINT_TYPE_SPECIAL = 2;
+ MAP_MARK_POINT_TYPE_MINE = 3;
+ MAP_MARK_POINT_TYPE_COLLECTION = 4;
+ MAP_MARK_POINT_TYPE_MONSTER = 5;
+ MAP_MARK_POINT_TYPE_FISH_POOL = 6;
}
diff --git a/proto/MarkMapReq.proto b/proto/MarkMapReq.proto
old mode 100644
new mode 100755
index 2e57ebb..41e9fe2
--- a/proto/MarkMapReq.proto
+++ b/proto/MarkMapReq.proto
@@ -3,9 +3,24 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "MapMarkPoint.proto";
-import "Operation.proto";
message MarkMapReq {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 3216;
+ }
+
+ enum Operation {
+ ADD = 0;
+ MOD = 1;
+ DEL = 2;
+ GET = 3;
+ }
+
Operation op = 1;
MapMarkPoint old = 2;
MapMarkPoint mark = 3;
diff --git a/proto/MassivePropParam.proto b/proto/MassivePropParam.proto
old mode 100644
new mode 100755
index bd30d45..80ca7ee
--- a/proto/MassivePropParam.proto
+++ b/proto/MassivePropParam.proto
@@ -2,9 +2,10 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message MassivePropParam {
- int32 elementReactionType = 1;
- uint32 casterId = 2;
- repeated float paramList = 3;
- uint32 syncFlag = 4;
+ int32 type = 1;
+ repeated uint32 reaction_info_list = 2;
+ repeated float param_list = 3;
+ uint32 sync_flag = 4;
}
diff --git a/proto/MassivePropSyncInfo.proto b/proto/MassivePropSyncInfo.proto
old mode 100644
new mode 100755
index 276f7a3..b197a12
--- a/proto/MassivePropSyncInfo.proto
+++ b/proto/MassivePropSyncInfo.proto
@@ -6,5 +6,5 @@ import "MassivePropParam.proto";
message MassivePropSyncInfo {
int64 id = 1;
- map propMap = 2;
+ repeated MassivePropParam prop_list = 2;
}
diff --git a/proto/Material.proto b/proto/Material.proto
old mode 100644
new mode 100755
index 4fd76bc..2303cf6
--- a/proto/Material.proto
+++ b/proto/Material.proto
@@ -6,5 +6,5 @@ import "MaterialDeleteInfo.proto";
message Material {
uint32 count = 1;
- MaterialDeleteInfo deleteInfo = 2;
+ MaterialDeleteInfo delete_info = 2;
}
diff --git a/proto/MaterialDeleteInfo.proto b/proto/MaterialDeleteInfo.proto
old mode 100644
new mode 100755
index 9e5a310..1c8877c
--- a/proto/MaterialDeleteInfo.proto
+++ b/proto/MaterialDeleteInfo.proto
@@ -2,15 +2,25 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "CountDownDelete.proto";
-import "DateTimeDelete.proto";
-import "DelayWeekCountDownDelete.proto";
message MaterialDeleteInfo {
- bool hasDeleteConfig = 1;
- oneof deleteInfo {
- CountDownDelete countDownDelete = 2;
- DateTimeDelete dateDelete = 3;
- DelayWeekCountDownDelete delayWeekCountDownDelete = 4;
+ message CountDownDelete {
+ map delete_time_num_map = 1;
+ uint32 config_count_down_time = 2;
}
+ message DateTimeDelete {
+ uint32 delete_time = 1;
+ }
+ message DelayWeekCountDownDelete {
+ map delete_time_num_map = 1;
+ uint32 config_delay_week = 2;
+ uint32 config_count_down_time = 3;
+ }
+
+ oneof DeleteInfo {
+ CountDownDelete count_down_delete = 2;
+ DateTimeDelete date_delete = 3;
+ DelayWeekCountDownDelete delay_week_count_down_delete = 4;
+ }
+ bool has_delete_config = 1;
}
diff --git a/proto/MaterialInfo.proto b/proto/MaterialInfo.proto
old mode 100644
new mode 100755
diff --git a/proto/MathQuaternion.proto b/proto/MathQuaternion.proto
old mode 100644
new mode 100755
index a368966..131e9a1
--- a/proto/MathQuaternion.proto
+++ b/proto/MathQuaternion.proto
@@ -2,9 +2,10 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message MathQuaternion {
- float x = 1;
- float y = 2;
- float z = 3;
- float w = 4;
+ float X = 1;
+ float Y = 2;
+ float Z = 3;
+ float W = 4;
}
diff --git a/proto/ModifierDurability.proto b/proto/ModifierDurability.proto
old mode 100644
new mode 100755
index ed8d9e7..f59ccd0
--- a/proto/ModifierDurability.proto
+++ b/proto/ModifierDurability.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ModifierDurability {
- float reduceRatio = 1;
- float remainingDurability = 2;
+ float reduce_ratio = 1;
+ float remaining_durability = 2;
}
diff --git a/proto/MonsterBornType.proto b/proto/MonsterBornType.proto
old mode 100644
new mode 100755
index 31aade8..d44d80f
--- a/proto/MonsterBornType.proto
+++ b/proto/MonsterBornType.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum MonsterBornType {
- MonsterBornNone = 0;
- MonsterBornDefault = 1;
- MonsterBornRandom = 2;
+ MONSTER_BORN_NONE = 0;
+ MONSTER_BORN_DEFAULT = 1;
+ MONSTER_BORN_RANDOM = 2;
}
diff --git a/proto/MonsterRoute.proto b/proto/MonsterRoute.proto
old mode 100644
new mode 100755
index ac98be7..dfea993
--- a/proto/MonsterRoute.proto
+++ b/proto/MonsterRoute.proto
@@ -5,8 +5,8 @@ option java_package = "emu.grasscutter.net.proto";
import "RoutePoint.proto";
message MonsterRoute {
- RoutePoint routePoints = 1;
- uint32 speedLevel = 2;
- uint32 routeType = 3;
- float arriveRange = 4;
+ repeated RoutePoint route_points = 1;
+ uint32 speed_level = 2;
+ uint32 route_type = 3;
+ float arrive_range = 4;
}
diff --git a/proto/MotionInfo.proto b/proto/MotionInfo.proto
old mode 100644
new mode 100755
index faddc14..3ce74eb
--- a/proto/MotionInfo.proto
+++ b/proto/MotionInfo.proto
@@ -2,8 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "MotionState.proto";
import "Vector.proto";
+import "MotionState.proto";
message MotionInfo {
Vector pos = 1;
@@ -11,8 +11,8 @@ message MotionInfo {
Vector speed = 3;
MotionState state = 4;
repeated Vector params = 5;
- Vector refPos = 6;
- uint32 refId = 7;
- uint32 sceneTime = 8;
- uint32 intervalVelocity = 9;
+ Vector ref_pos = 6;
+ uint32 ref_id = 7;
+ uint32 scene_time = 8;
+ uint32 interval_velocity = 9;
}
diff --git a/proto/MotionState.proto b/proto/MotionState.proto
old mode 100644
new mode 100755
index 91102ee..6897fc3
--- a/proto/MotionState.proto
+++ b/proto/MotionState.proto
@@ -3,51 +3,59 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum MotionState {
- MotionNone = 0;
- MotionReset = 1;
- MotionStandby = 2;
- MotionStandbyMove = 3;
- MotionWalk = 4;
- MotionRun = 5;
- MotionDash = 6;
- MotionClimb = 7;
- MotionClimbJump = 8;
- MotionStandbyToClimb = 9;
- MotionFight = 10;
- MotionJump = 11;
- MotionDrop = 12;
- MotionFly = 13;
- MotionSwimMove = 14;
- MotionSwimIdle = 15;
- MotionSwimDash = 16;
- MotionSwimJump = 17;
- MotionSlip = 18;
- MotionGoUpstairs = 19;
- MotionFallOnGround = 20;
- MotionJumpUpWallForStandby = 21;
- MotionJumpOffWall = 22;
- MotionPoweredFly = 23;
- MotionLadderIdle = 24;
- MotionLadderMove = 25;
- MotionLadderSlip = 26;
- MotionStandbyToLadder = 27;
- MotionLadderToStandby = 28;
- MotionDangerStandby = 29;
- MotionDangerStandbyMove = 30;
- MotionDangerWalk = 31;
- MotionDangerRun = 32;
- MotionDangerDash = 33;
- MotionCrouchIdle = 34;
- MotionCrouchMove = 35;
- MotionCrouchRoll = 36;
- MotionNotify = 37;
- MotionLandSpeed = 38;
- MotionMoveFailAck = 39;
- MotionWaterfall = 40;
- MotionDashBeforeShake = 41;
- MotionSitIdle = 42;
- MotionForceSetPos = 43;
- MotionQuestForceDrag = 44;
- MotionFollowRoute = 45;
- MotionNum = 46;
+ MOTION_NONE = 0;
+ MOTION_RESET = 1;
+ MOTION_STANDBY = 2;
+ MOTION_STANDBY_MOVE = 3;
+ MOTION_WALK = 4;
+ MOTION_RUN = 5;
+ MOTION_DASH = 6;
+ MOTION_CLIMB = 7;
+ MOTION_CLIMB_JUMP = 8;
+ MOTION_STANDBY_TO_CLIMB = 9;
+ MOTION_FIGHT = 10;
+ MOTION_JUMP = 11;
+ MOTION_DROP = 12;
+ MOTION_FLY = 13;
+ MOTION_SWIM_MOVE = 14;
+ MOTION_SWIM_IDLE = 15;
+ MOTION_SWIM_DASH = 16;
+ MOTION_SWIM_JUMP = 17;
+ MOTION_SLIP = 18;
+ MOTION_GO_UPSTAIRS = 19;
+ MOTION_FALL_ON_GROUND = 20;
+ MOTION_JUMP_UP_WALL_FOR_STANDBY = 21;
+ MOTION_JUMP_OFF_WALL = 22;
+ MOTION_POWERED_FLY = 23;
+ MOTION_LADDER_IDLE = 24;
+ MOTION_LADDER_MOVE = 25;
+ MOTION_LADDER_SLIP = 26;
+ MOTION_STANDBY_TO_LADDER = 27;
+ MOTION_LADDER_TO_STANDBY = 28;
+ MOTION_DANGER_STANDBY = 29;
+ MOTION_DANGER_STANDBY_MOVE = 30;
+ MOTION_DANGER_WALK = 31;
+ MOTION_DANGER_RUN = 32;
+ MOTION_DANGER_DASH = 33;
+ MOTION_CROUCH_IDLE = 34;
+ MOTION_CROUCH_MOVE = 35;
+ MOTION_CROUCH_ROLL = 36;
+ MOTION_NOTIFY = 37;
+ MOTION_LAND_SPEED = 38;
+ MOTION_MOVE_FAIL_ACK = 39;
+ MOTION_WATERFALL = 40;
+ MOTION_DASH_BEFORE_SHAKE = 41;
+ MOTION_SIT_IDLE = 42;
+ MOTION_FORCE_SET_POS = 43;
+ MOTION_QUEST_FORCE_DRAG = 44;
+ MOTION_FOLLOW_ROUTE = 45;
+ MOTION_SKIFF_BOARDING = 46;
+ MOTION_SKIFF_NORMAL = 47;
+ MOTION_SKIFF_DASH = 48;
+ MOTION_SKIFF_POWERED_DASH = 49;
+ MOTION_DESTROY_VEHICLE = 50;
+ MOTION_FLY_IDLE = 51;
+ MOTION_FLY_SLOW = 52;
+ MOTION_FLY_FAST = 53;
+ MOTION_NUM = 54;
}
diff --git a/proto/MovingPlatformType.proto b/proto/MovingPlatformType.proto
old mode 100644
new mode 100755
index f3861d1..9821a83
--- a/proto/MovingPlatformType.proto
+++ b/proto/MovingPlatformType.proto
@@ -2,6 +2,9 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-message MovingPlatformType {
-
+enum MovingPlatformType {
+ MOVING_PLATFORM_NONE = 0;
+ MOVING_PLATFORM_USE_CONFIG = 1;
+ MOVING_PLATFORM_ABILITY = 2;
+ MOVING_PLATFORM_ROUTE = 3;
}
diff --git a/proto/MpPlayRewardInfo.proto b/proto/MpPlayRewardInfo.proto
new file mode 100644
index 0000000..a34cec4
--- /dev/null
+++ b/proto/MpPlayRewardInfo.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message MpPlayRewardInfo {
+ uint32 resin = 1;
+ repeated uint32 remain_uid_list = 2;
+ repeated uint32 qualify_uid_list = 3;
+}
diff --git a/proto/MpSettingType.proto b/proto/MpSettingType.proto
old mode 100644
new mode 100755
index f24083b..886f1e4
--- a/proto/MpSettingType.proto
+++ b/proto/MpSettingType.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum MpSettingType {
- MpSettingNoEnter = 0;
- MpSettingEnterFreely = 1;
- MpSettingEnterAfterApply = 2;
+ MP_SETTING_NO_ENTER = 0;
+ MP_SETTING_ENTER_FREELY = 1;
+ MP_SETTING_ENTER_AFTER_APPLY = 2;
}
diff --git a/proto/NpcTalkReq.proto b/proto/NpcTalkReq.proto
old mode 100644
new mode 100755
index 80490a6..e6a90f0
--- a/proto/NpcTalkReq.proto
+++ b/proto/NpcTalkReq.proto
@@ -3,6 +3,15 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message NpcTalkReq {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 549;
+ }
+
uint32 npc_entity_id = 1;
uint32 talk_id = 3;
uint32 entity_id = 4;
diff --git a/proto/NpcTalkRsp.proto b/proto/NpcTalkRsp.proto
old mode 100644
new mode 100755
index 0d02fa5..5e398ad
--- a/proto/NpcTalkRsp.proto
+++ b/proto/NpcTalkRsp.proto
@@ -3,8 +3,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message NpcTalkRsp {
- int32 retcode = 1;
- uint32 npc_entity_id = 2;
- uint32 cur_talk_id = 4;
- uint32 entity_id = 5;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 518;
+ }
+
+ int32 retcode = 1;
+ uint32 npc_entity_id = 2;
+ uint32 cur_talk_id = 4;
+ uint32 entity_id = 5;
}
diff --git a/proto/DelMailReq.proto b/proto/OfferingInfo.proto
similarity index 57%
rename from proto/DelMailReq.proto
rename to proto/OfferingInfo.proto
index 5f07ac0..99e8ee6 100644
--- a/proto/DelMailReq.proto
+++ b/proto/OfferingInfo.proto
@@ -2,6 +2,6 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-message DelMailReq {
- repeated uint32 mailIdList = 1;
+message OfferingInfo {
+ uint32 offering_id = 1;
}
diff --git a/proto/OnlinePlayerInfo.proto b/proto/OnlinePlayerInfo.proto
old mode 100644
new mode 100755
index 76ed24a..8df80a8
--- a/proto/OnlinePlayerInfo.proto
+++ b/proto/OnlinePlayerInfo.proto
@@ -2,19 +2,21 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "HeadImage.proto";
import "MpSettingType.proto";
+import "ProfilePicture.proto";
message OnlinePlayerInfo {
uint32 uid = 1;
string nickname = 2;
- uint32 playerLevel = 3;
- MpSettingType mpSettingType = 5;
- uint32 curPlayerNumInWorld = 6;
- uint32 worldLevel = 7;
- string onlineId = 8;
- uint32 nameCardId = 9;
- repeated uint32 blacklistUidList = 10;
+ uint32 player_level = 3;
+ uint32 avatar_id = 4;
+ MpSettingType mp_setting_type = 5;
+ uint32 cur_player_num_in_world = 6;
+ uint32 world_level = 7;
+ string online_id = 8;
+ uint32 name_card_id = 9;
+ repeated uint32 blacklist_uid_list = 10;
string signature = 11;
- HeadImage avatar = 12;
+ ProfilePicture profile_picture = 12;
+ string psn_id = 13;
}
diff --git a/proto/OpenStateUpdateNotify.proto b/proto/OpenStateUpdateNotify.proto
old mode 100644
new mode 100755
index 91d1d2f..8d70a9d
--- a/proto/OpenStateUpdateNotify.proto
+++ b/proto/OpenStateUpdateNotify.proto
@@ -2,6 +2,15 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message OpenStateUpdateNotify {
- map openStateMap = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 196;
+ }
+
+ map open_state_map = 1;
}
diff --git a/proto/Operation.proto b/proto/Operation.proto
old mode 100644
new mode 100755
diff --git a/proto/PacketHead.proto b/proto/PacketHead.proto
old mode 100644
new mode 100755
index a9e4e52..bb63f4a
--- a/proto/PacketHead.proto
+++ b/proto/PacketHead.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PacketHead {
- uint32 clientSequenceId = 3;
+ uint32 client_sequence_id = 3;
uint64 timestamp = 6;
}
diff --git a/proto/PingReq.proto b/proto/PingReq.proto
old mode 100644
new mode 100755
index 231ece4..e5bc38c
--- a/proto/PingReq.proto
+++ b/proto/PingReq.proto
@@ -2,7 +2,20 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PingReq {
- int32 seq = 1;
- int32 clientTime = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 100;
+ }
+
+ uint32 seq = 1;
+ uint32 client_time = 2;
+ bytes sc_data = 3;
+ float ue_time = 4;
+ double total_tick_time = 5;
}
diff --git a/proto/PingRsp.proto b/proto/PingRsp.proto
old mode 100644
new mode 100755
index 3efd497..b898469
--- a/proto/PingRsp.proto
+++ b/proto/PingRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PingRsp {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ CMD_ID = 1;
+ ENET_IS_RELIABLE = 1;
+ }
+
int32 retcode = 1;
uint32 seq = 2;
- uint32 clientTime = 3;
+ uint32 client_time = 3;
}
diff --git a/proto/PlatformInfo.proto b/proto/PlatformInfo.proto
old mode 100644
new mode 100755
index c78b36b..659afc3
--- a/proto/PlatformInfo.proto
+++ b/proto/PlatformInfo.proto
@@ -2,24 +2,24 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+import "Vector.proto";
import "MathQuaternion.proto";
import "MovingPlatformType.proto";
import "Route.proto";
-import "Vector.proto";
message PlatformInfo {
- uint32 routeId = 1;
- int32 startIndex = 2;
- uint32 startRouteTime = 3;
- uint32 startSceneTime = 4;
- Vector startPos = 7;
- bool isStarted = 8;
- MathQuaternion startRot = 9;
- uint32 stopSceneTime = 10;
- Vector posOffset = 11;
- MathQuaternion rotOffset = 12;
- MovingPlatformType movingPlatformType = 13;
- bool isActive = 14;
+ uint32 route_id = 1;
+ int32 start_index = 2;
+ uint32 start_route_time = 3;
+ uint32 start_scene_time = 4;
+ Vector start_pos = 7;
+ bool is_started = 8;
+ MathQuaternion start_rot = 9;
+ uint32 stop_scene_time = 10;
+ Vector pos_offset = 11;
+ MathQuaternion rot_offset = 12;
+ MovingPlatformType moving_platform_type = 13;
+ bool is_active = 14;
Route route = 15;
- uint32 pointId = 16;
+ uint32 point_id = 16;
}
diff --git a/proto/PlatformType.proto b/proto/PlatformType.proto
new file mode 100644
index 0000000..8f49046
--- /dev/null
+++ b/proto/PlatformType.proto
@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+enum PlatformType {
+ EDITOR = 0;
+ IOS = 1;
+ ANDROID = 2;
+ PC = 3;
+ PS4 = 4;
+ SERVER = 5;
+ CLOUD_ANDROID = 6;
+ CLOUD_IOS = 7;
+ PS5 = 8;
+ CLOUD_WEB = 9;
+ CLOUD_TV = 10;
+}
diff --git a/proto/PlayTeamEntityInfo.proto b/proto/PlayTeamEntityInfo.proto
new file mode 100644
index 0000000..0e76366
--- /dev/null
+++ b/proto/PlayTeamEntityInfo.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "AbilitySyncStateInfo.proto";
+
+message PlayTeamEntityInfo {
+ uint32 entity_id = 1;
+ uint32 player_uid = 2;
+ uint32 authority_peer_id = 3;
+ uint32 gadget_config_id = 5;
+ AbilitySyncStateInfo ability_info = 6;
+}
diff --git a/proto/PlayerApplyEnterMpNotify.proto b/proto/PlayerApplyEnterMpNotify.proto
old mode 100644
new mode 100755
index c5b3cc1..b742a42
--- a/proto/PlayerApplyEnterMpNotify.proto
+++ b/proto/PlayerApplyEnterMpNotify.proto
@@ -5,6 +5,15 @@ option java_package = "emu.grasscutter.net.proto";
import "OnlinePlayerInfo.proto";
message PlayerApplyEnterMpNotify {
- OnlinePlayerInfo srcPlayerInfo = 1;
- uint32 srcAppId = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1803;
+ }
+
+ OnlinePlayerInfo src_player_info = 1;
+ uint32 src_app_id = 2;
+ uint32 src_thread_index = 3;
}
diff --git a/proto/PlayerApplyEnterMpReason.proto b/proto/PlayerApplyEnterMpReason.proto
old mode 100644
new mode 100755
diff --git a/proto/PlayerApplyEnterMpReq.proto b/proto/PlayerApplyEnterMpReq.proto
old mode 100644
new mode 100755
index b4fc372..8d4c5f1
--- a/proto/PlayerApplyEnterMpReq.proto
+++ b/proto/PlayerApplyEnterMpReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PlayerApplyEnterMpReq {
- uint32 targetUid = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1843;
+ }
+
+ uint32 target_uid = 1;
}
diff --git a/proto/PlayerApplyEnterMpResultNotify.proto b/proto/PlayerApplyEnterMpResultNotify.proto
old mode 100644
new mode 100755
index 2befeaf..7c8921a
--- a/proto/PlayerApplyEnterMpResultNotify.proto
+++ b/proto/PlayerApplyEnterMpResultNotify.proto
@@ -2,11 +2,35 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "PlayerApplyEnterMpReason.proto";
message PlayerApplyEnterMpResultNotify {
- uint32 targetUid = 1;
- bool isAgreed = 2;
- PlayerApplyEnterMpReason reason = 3;
- string targetNickname = 4;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1805;
+ }
+
+ enum Reason {
+ PLAYER_JUDGE = 0;
+ SCENE_CANNOT_ENTER = 1;
+ PLAYER_CANNOT_ENTER_MP = 2;
+ SYSTEM_JUDGE = 3;
+ ALLOW_ENTER_PLAYER_FULL = 4;
+ WORLD_LEVEL_LOWER_THAN_HOST = 5;
+ HOST_IN_MATCH = 6;
+ PLAYER_IN_BLACKLIST = 7;
+ PS_PLAYER_NOT_ACCEPT_OTHERS = 8;
+ HOST_IS_BLOCKED = 9;
+ OTHER_DATA_VERSION_NOT_LATEST = 10;
+ DATA_VERSION_NOT_LATEST = 11;
+ PLAYER_NOT_IN_PLAYER_WORLD = 12;
+ MAX_PLAYER = 13;
+ }
+
+ uint32 target_uid = 1;
+ bool is_agreed = 2;
+ Reason reason = 3;
+ string target_nickname = 4;
}
diff --git a/proto/PlayerApplyEnterMpResultReq.proto b/proto/PlayerApplyEnterMpResultReq.proto
old mode 100644
new mode 100755
index 6e151c9..c084c00
--- a/proto/PlayerApplyEnterMpResultReq.proto
+++ b/proto/PlayerApplyEnterMpResultReq.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PlayerApplyEnterMpResultReq {
- uint32 applyUid = 1;
- bool isAgreed = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1824;
+ }
+
+ uint32 apply_uid = 1;
+ bool is_agreed = 2;
}
diff --git a/proto/PlayerApplyEnterMpResultRsp.proto b/proto/PlayerApplyEnterMpResultRsp.proto
old mode 100644
new mode 100755
index b385556..d7d42eb
--- a/proto/PlayerApplyEnterMpResultRsp.proto
+++ b/proto/PlayerApplyEnterMpResultRsp.proto
@@ -2,9 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PlayerApplyEnterMpResultRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1832;
+ }
+
int32 retcode = 1;
- uint32 applyUid = 2;
- bool isAgreed = 3;
+ uint32 apply_uid = 2;
+ bool is_agreed = 3;
uint32 param = 4;
}
diff --git a/proto/PlayerApplyEnterMpRsp.proto b/proto/PlayerApplyEnterMpRsp.proto
old mode 100644
new mode 100755
index 29148a0..05e7e34
--- a/proto/PlayerApplyEnterMpRsp.proto
+++ b/proto/PlayerApplyEnterMpRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PlayerApplyEnterMpRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1827;
+ }
+
int32 retcode = 1;
- uint32 targetUid = 2;
+ uint32 target_uid = 2;
uint32 param = 3;
}
diff --git a/proto/PlayerChatNotify.proto b/proto/PlayerChatNotify.proto
old mode 100644
new mode 100755
index e6844e8..738602a
--- a/proto/PlayerChatNotify.proto
+++ b/proto/PlayerChatNotify.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "ChatInfo.proto";
message PlayerChatNotify {
- uint32 channelId = 1;
- ChatInfo chatInfo = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 3122;
+ }
+
+ uint32 channel_id = 1;
+ ChatInfo chat_info = 2;
}
diff --git a/proto/PlayerChatReq.proto b/proto/PlayerChatReq.proto
old mode 100644
new mode 100755
index 37e37a1..4568a6b
--- a/proto/PlayerChatReq.proto
+++ b/proto/PlayerChatReq.proto
@@ -5,6 +5,15 @@ option java_package = "emu.grasscutter.net.proto";
import "ChatInfo.proto";
message PlayerChatReq {
- uint32 channelId = 1;
- ChatInfo chatInfo = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 3326;
+ }
+
+ uint32 channel_id = 1;
+ ChatInfo chat_info = 2;
}
diff --git a/proto/PlayerChatRsp.proto b/proto/PlayerChatRsp.proto
old mode 100644
new mode 100755
index 01d9b31..1b9e8e0
--- a/proto/PlayerChatRsp.proto
+++ b/proto/PlayerChatRsp.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PlayerChatRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 3485;
+ }
+
int32 retcode = 1;
- uint32 chatForbiddenEndtime = 2;
+ uint32 chat_forbidden_endtime = 2;
}
diff --git a/proto/PlayerDataNotify.proto b/proto/PlayerDataNotify.proto
old mode 100644
new mode 100755
index 817cc4c..117e4fd
--- a/proto/PlayerDataNotify.proto
+++ b/proto/PlayerDataNotify.proto
@@ -5,9 +5,17 @@ option java_package = "emu.grasscutter.net.proto";
import "PropValue.proto";
message PlayerDataNotify {
- string nickName = 1;
- uint64 clientTime = 2;
- bool isFirstLoginToday = 3;
- uint32 regionId = 4;
- map propMap = 6;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 142;
+ }
+
+ string nick_name = 1;
+ uint64 server_time = 2;
+ bool is_first_login_today = 3;
+ uint32 region_id = 4;
+ map prop_map = 6;
}
diff --git a/proto/PlayerDieType.proto b/proto/PlayerDieType.proto
old mode 100644
new mode 100755
index d26a555..bd9edaf
--- a/proto/PlayerDieType.proto
+++ b/proto/PlayerDieType.proto
@@ -3,13 +3,13 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum PlayerDieType {
- PlayerDieNone = 0;
- PlayerDieKillByMonster = 1;
- PlayerDieKillByGear = 2;
- PlayerDieFall = 3;
- PlayerDieDrawn = 4;
- PlayerDieAbyss = 5;
- PlayerDieGm = 6;
- PlayerDieClimateCold = 7;
- PlayerDieStormLighting = 8;
+ PLAYER_DIE_NONE = 0;
+ PLAYER_DIE_KILL_BY_MONSTER = 1;
+ PLAYER_DIE_KILL_BY_GEAR = 2;
+ PLAYER_DIE_FALL = 3;
+ PLAYER_DIE_DRAWN = 4;
+ PLAYER_DIE_ABYSS = 5;
+ PLAYER_DIE_GM = 6;
+ PLAYER_DIE_CLIMATE_COLD = 7;
+ PLAYER_DIE_STORM_LIGHTING = 8;
}
diff --git a/proto/PlayerEnterSceneInfoNotify.proto b/proto/PlayerEnterSceneInfoNotify.proto
old mode 100644
new mode 100755
index 77e952e..1202f05
--- a/proto/PlayerEnterSceneInfoNotify.proto
+++ b/proto/PlayerEnterSceneInfoNotify.proto
@@ -2,14 +2,23 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "AvatarEnterSceneInfo.proto";
-import "MPLevelEntityInfo.proto";
import "TeamEnterSceneInfo.proto";
+import "MPLevelEntityInfo.proto";
+import "AvatarEnterSceneInfo.proto";
message PlayerEnterSceneInfoNotify {
- uint32 curAvatarEntityId = 1;
- repeated AvatarEnterSceneInfo avatarEnterInfo = 2;
- TeamEnterSceneInfo teamEnterInfo = 3;
- MPLevelEntityInfo mpLevelEntityInfo = 4;
- uint32 enterSceneToken = 5;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 246;
+ }
+
+ uint32 cur_avatar_entity_id = 1;
+ repeated AvatarEnterSceneInfo avatar_enter_info = 2;
+ TeamEnterSceneInfo team_enter_info = 3;
+ MPLevelEntityInfo mp_level_entity_info = 4;
+ uint32 enter_scene_token = 5;
}
diff --git a/proto/PlayerEnterSceneNotify.proto b/proto/PlayerEnterSceneNotify.proto
old mode 100644
new mode 100755
index 1302e05..3dc84e1
--- a/proto/PlayerEnterSceneNotify.proto
+++ b/proto/PlayerEnterSceneNotify.proto
@@ -2,24 +2,32 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "EnterType.proto";
import "Vector.proto";
+import "EnterType.proto";
message PlayerEnterSceneNotify {
- uint32 sceneId = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 249;
+ }
+
+ uint32 scene_id = 1;
Vector pos = 2;
- uint64 sceneBeginTime = 3;
+ uint64 scene_begin_time = 3;
EnterType type = 4;
- uint32 targetUid = 6;
- uint32 prevSceneId = 9;
- Vector prevPos = 10;
- uint32 dungeonId = 11;
- uint32 worldLevel = 12;
- uint32 enterSceneToken = 13;
- bool isFirstLoginEnterScene = 14;
- repeated uint32 sceneTagIdList = 15;
- bool isSkipUi = 16;
- uint32 enterReason = 17;
- uint32 unk1 = 18;
- string unk2 = 19;
+ uint32 target_uid = 6;
+ uint32 prev_scene_id = 9;
+ Vector prev_pos = 10;
+ uint32 dungeon_id = 11;
+ uint32 world_level = 12;
+ uint32 enter_scene_token = 13;
+ bool is_first_login_enter_scene = 14;
+ repeated uint32 scene_tag_id_list = 15;
+ bool is_skip_ui = 16;
+ uint32 enter_reason = 17;
+ uint32 world_type = 18;
+ string scene_transaction = 19;
}
diff --git a/proto/PlayerGameTimeNotify.proto b/proto/PlayerGameTimeNotify.proto
old mode 100644
new mode 100755
index c8292aa..53f0daf
--- a/proto/PlayerGameTimeNotify.proto
+++ b/proto/PlayerGameTimeNotify.proto
@@ -2,7 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PlayerGameTimeNotify {
- uint32 gameTime = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 112;
+ }
+
+ uint32 game_time = 1;
uint32 uid = 2;
+ bool is_home = 3;
}
diff --git a/proto/PlayerGetForceQuitBanInfoRsp.proto b/proto/PlayerGetForceQuitBanInfoRsp.proto
old mode 100644
new mode 100755
index 35de4f4..bdac227
--- a/proto/PlayerGetForceQuitBanInfoRsp.proto
+++ b/proto/PlayerGetForceQuitBanInfoRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PlayerGetForceQuitBanInfoRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 4188;
+ }
+
int32 retcode = 1;
- uint32 matchId = 2;
- uint32 expireTime = 3;
+ uint32 match_id = 2;
+ uint32 expire_time = 3;
}
diff --git a/proto/PlayerLevelRewardUpdateNotify.proto b/proto/PlayerLevelRewardUpdateNotify.proto
old mode 100644
new mode 100755
index 522ccfe..dc3dd44
--- a/proto/PlayerLevelRewardUpdateNotify.proto
+++ b/proto/PlayerLevelRewardUpdateNotify.proto
@@ -1,7 +1,16 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-message PlayerLevelRewardUpdateNotify {
- repeated uint32 levelList = 1;
-}
\ No newline at end of file
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message PlayerLevelRewardUpdateNotify {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 152;
+ }
+
+ repeated uint32 level_list = 1;
+}
diff --git a/proto/PlayerLocationInfo.proto b/proto/PlayerLocationInfo.proto
old mode 100644
new mode 100755
diff --git a/proto/PlayerLoginReq.proto b/proto/PlayerLoginReq.proto
old mode 100644
new mode 100755
index 9d206ed..095047f
--- a/proto/PlayerLoginReq.proto
+++ b/proto/PlayerLoginReq.proto
@@ -3,39 +3,54 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "TrackingIOInfo.proto";
+import "AdjustTrackingInfo.proto";
message PlayerLoginReq {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 189;
+ }
+
string token = 1;
- string clientVersion = 2;
- string systemVersion = 3;
- string deviceName = 4;
- string deviceUuid = 5;
- uint32 targetUid = 6;
- uint64 loginRand = 7;
- bool isEditor = 8;
- uint32 languageType = 9;
- uint32 accountType = 10;
- string accountUid = 11;
+ string client_version = 2;
+ string system_version = 3;
+ string device_name = 4;
+ string device_uuid = 5;
+ uint32 target_uid = 6;
+ uint64 login_rand = 7;
+ bool is_editor = 8;
+ uint32 language_type = 9;
+ uint32 account_type = 10;
+ string account_uid = 11;
string platform = 12;
- string deviceInfo = 13;
- uint32 platformType = 14;
- bool isGuest = 15;
- uint32 cloudClientIp = 16;
- uint32 gmUid = 17;
+ string device_info = 13;
+ uint32 platform_type = 14;
+ bool is_guest = 15;
+ uint32 cloud_client_ip = 16;
+ uint32 gm_uid = 17;
string checksum = 18;
- string onlineId = 19;
- uint32 clientToken = 20;
- bytes securityCmdReply = 21;
- bytes extraBinData = 22;
+ string online_id = 19;
+ uint32 client_token = 20;
+ bytes security_cmd_reply = 21;
+ bytes extra_bin_data = 22;
string cps = 23;
- uint32 channelId = 24;
- uint32 subChannelId = 25;
- string checksumClientVersion = 26;
+ uint32 channel_id = 24;
+ uint32 sub_channel_id = 25;
+ string checksum_client_version = 26;
uint32 tag = 27;
- TrackingIOInfo trackingIoInfo = 28;
- string countryCode = 29;
- uint32 clientDataVersion = 30;
- bytes environmentErrorCode = 31;
- uint32 targetHomeOwnerUid = 32;
- string psnId = 33;
+ TrackingIOInfo tracking_io_info = 28;
+ string country_code = 29;
+ uint32 client_data_version = 30;
+ bytes environment_error_code = 31;
+ uint32 target_home_owner_uid = 32;
+ string psn_id = 33;
+ string client_verison_hash = 34;
+ bool is_transfer = 35;
+ uint32 reg_platform = 36;
+ uint32 target_home_param = 37;
+ AdjustTrackingInfo adjust_tracking_info = 38;
}
diff --git a/proto/PlayerLoginRsp.proto b/proto/PlayerLoginRsp.proto
old mode 100644
new mode 100755
index d11fd44..0aa59e2
--- a/proto/PlayerLoginRsp.proto
+++ b/proto/PlayerLoginRsp.proto
@@ -2,40 +2,51 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "BlockInfo.proto";
-import "FeatureBlockInfo.proto";
import "ResVersionConfig.proto";
+import "BlockInfo.proto";
import "ShortAbilityHashPair.proto";
+import "FeatureBlockInfo.proto";
message PlayerLoginRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 184;
+ }
+
int32 retcode = 1;
- bytes playerData = 2;
- bool isNewPlayer = 3;
- uint32 targetUid = 4;
- uint64 loginRand = 5;
- bool isUseAbilityHash = 6;
- int32 abilityHashCode = 7;
- map abilityHashMap = 8;
- uint32 clientDataVersion = 9;
- bool isRelogin = 11;
- uint32 clientSilenceDataVersion = 13;
- string gameBiz = 14;
- uint32 playerDataVersion = 15;
- string clientMd5 = 16;
- string clientSilenceMd5 = 17;
- ResVersionConfig resVersionConfig = 20;
- map blockInfoMap = 21;
- string clientVersionSuffix = 24;
- string clientSilenceVersionSuffix = 25;
- repeated ShortAbilityHashPair shortAbilityHashMap = 27;
- bytes scInfo = 28;
- bool isAudit = 29;
- bool isScOpen = 30;
- string registerCps = 31;
- repeated FeatureBlockInfo featureBlockInfoList = 32;
- bool isDataNeedRelogin = 33;
- string countryCode = 34;
- ResVersionConfig nextResVersionConfig = 35;
- string nextResourceUrl = 36;
- uint32 targetHomeOwnerUid = 37;
+ bytes player_data = 2;
+ bool is_new_player = 3;
+ uint32 target_uid = 4;
+ uint64 login_rand = 5;
+ bool is_use_ability_hash = 6;
+ int32 ability_hash_code = 7;
+ map ability_hash_map = 8;
+ uint32 client_data_version = 9;
+ bool is_relogin = 11;
+ uint32 client_silence_data_version = 13;
+ string game_biz = 14;
+ uint32 player_data_version = 15;
+ string client_md5 = 16;
+ string client_silence_md5 = 17;
+ ResVersionConfig res_version_config = 20;
+ map block_info_map = 21;
+ string client_version_suffix = 24;
+ string client_silence_version_suffix = 25;
+ repeated ShortAbilityHashPair short_ability_hash_map = 27;
+ bytes sc_info = 28;
+ bool is_audit = 29;
+ bool is_sc_open = 30;
+ string register_cps = 31;
+ repeated FeatureBlockInfo feature_block_info_list = 32;
+ bool is_data_need_relogin = 33;
+ string country_code = 34;
+ ResVersionConfig next_res_version_config = 35;
+ string next_resource_url = 36;
+ uint32 target_home_owner_uid = 37;
+ bool is_enable_client_hash_debug = 38;
+ bool is_transfer = 39;
+ double total_tick_time = 40;
}
diff --git a/proto/PlayerPropNotify.proto b/proto/PlayerPropNotify.proto
old mode 100644
new mode 100755
index 7341b4d..22d32bd
--- a/proto/PlayerPropNotify.proto
+++ b/proto/PlayerPropNotify.proto
@@ -5,5 +5,13 @@ option java_package = "emu.grasscutter.net.proto";
import "PropValue.proto";
message PlayerPropNotify {
- map propMap = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 126;
+ }
+
+ map prop_map = 1;
}
diff --git a/proto/PlayerRTTInfo.proto b/proto/PlayerRTTInfo.proto
old mode 100644
new mode 100755
index 2ed5433..4618fcb
--- a/proto/PlayerRTTInfo.proto
+++ b/proto/PlayerRTTInfo.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PlayerRTTInfo {
uint32 uid = 1;
uint32 rtt = 2;
diff --git a/proto/PlayerSetPauseReq.proto b/proto/PlayerSetPauseReq.proto
old mode 100644
new mode 100755
index 984c2f8..442bc47
--- a/proto/PlayerSetPauseReq.proto
+++ b/proto/PlayerSetPauseReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PlayerSetPauseReq {
- bool isPaused = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 121;
+ }
+
+ bool is_paused = 1;
}
diff --git a/proto/PlayerStoreNotify.proto b/proto/PlayerStoreNotify.proto
old mode 100644
new mode 100755
index 0202dcd..b81b784
--- a/proto/PlayerStoreNotify.proto
+++ b/proto/PlayerStoreNotify.proto
@@ -2,11 +2,19 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "Item.proto";
import "StoreType.proto";
+import "Item.proto";
message PlayerStoreNotify {
- StoreType storeType = 1;
- repeated Item itemList = 2;
- uint32 weightLimit = 3;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 649;
+ }
+
+ StoreType store_type = 1;
+ repeated Item item_list = 2;
+ uint32 weight_limit = 3;
}
diff --git a/proto/PlayerTimeNotify.proto b/proto/PlayerTimeNotify.proto
old mode 100644
new mode 100755
index 5085127..3b004f6
--- a/proto/PlayerTimeNotify.proto
+++ b/proto/PlayerTimeNotify.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PlayerTimeNotify {
- bool isPaused = 1;
- uint64 playerTime = 2;
- uint64 serverTime = 3;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 120;
+ }
+
+ bool is_paused = 1;
+ uint64 player_time = 2;
+ uint64 server_time = 3;
}
diff --git a/proto/WorldPlayerLocationInfo.proto b/proto/PlayerWorldLocationInfo.proto
similarity index 54%
rename from proto/WorldPlayerLocationInfo.proto
rename to proto/PlayerWorldLocationInfo.proto
index 8afcf18..282cbde 100644
--- a/proto/WorldPlayerLocationInfo.proto
+++ b/proto/PlayerWorldLocationInfo.proto
@@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto";
import "PlayerLocationInfo.proto";
-message WorldPlayerLocationInfo {
- uint32 sceneId = 1;
- PlayerLocationInfo playerLoc = 2;
+message PlayerWorldLocationInfo {
+ uint32 scene_id = 1;
+ PlayerLocationInfo player_loc = 2;
}
diff --git a/proto/PostEnterSceneRsp.proto b/proto/PostEnterSceneRsp.proto
old mode 100644
new mode 100755
index ec362f0..7e83621
--- a/proto/PostEnterSceneRsp.proto
+++ b/proto/PostEnterSceneRsp.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PostEnterSceneRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 3139;
+ }
+
int32 retcode = 1;
- uint32 enterSceneToken = 2;
+ uint32 enter_scene_token = 2;
}
diff --git a/proto/PrivateChatNotify.proto b/proto/PrivateChatNotify.proto
old mode 100644
new mode 100755
index 84457ef..d40a879
--- a/proto/PrivateChatNotify.proto
+++ b/proto/PrivateChatNotify.proto
@@ -5,5 +5,13 @@ option java_package = "emu.grasscutter.net.proto";
import "ChatInfo.proto";
message PrivateChatNotify {
- ChatInfo chatInfo = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 5039;
+ }
+
+ ChatInfo chat_info = 1;
}
diff --git a/proto/PrivateChatReq.proto b/proto/PrivateChatReq.proto
old mode 100644
new mode 100755
index 356aee6..388d254
--- a/proto/PrivateChatReq.proto
+++ b/proto/PrivateChatReq.proto
@@ -2,10 +2,20 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PrivateChatReq {
- uint32 targetUid = 1;
- oneof content {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 4999;
+ }
+
+ oneof Content {
string text = 2;
uint32 icon = 3;
}
+ uint32 target_uid = 1;
}
diff --git a/proto/PrivateChatRsp.proto b/proto/PrivateChatRsp.proto
old mode 100644
new mode 100755
index 09e427a..cbea58d
--- a/proto/PrivateChatRsp.proto
+++ b/proto/PrivateChatRsp.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PrivateChatRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 4968;
+ }
+
int32 retcode = 1;
- uint32 chatForbiddenEndtime = 2;
+ uint32 chat_forbidden_endtime = 2;
}
diff --git a/proto/ProfilePicture.proto b/proto/ProfilePicture.proto
new file mode 100644
index 0000000..2b6af59
--- /dev/null
+++ b/proto/ProfilePicture.proto
@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message ProfilePicture {
+ uint32 avatar_id = 1;
+ uint32 costume_id = 2;
+}
diff --git a/proto/PropChangeReason.proto b/proto/PropChangeReason.proto
old mode 100644
new mode 100755
index 123b1d6..f947a8e
--- a/proto/PropChangeReason.proto
+++ b/proto/PropChangeReason.proto
@@ -3,18 +3,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum PropChangeReason {
- PropChangeNone = 0;
- PropChangeStatueRecover = 1;
- PropChangeEnergyBall = 2;
- PropChangeAbility = 3;
- PropChangeLevelup = 4;
- PropChangeItem = 5;
- PropChangeAvatarCard = 6;
- PropChangeCityLevelup = 7;
- PropChangeAvatarUpgrade = 8;
- PropChangeAvatarPromote = 9;
- PropChangePlayerAddExp = 10;
- PropChangeFinishQuest = 11;
- PropChangeGm = 12;
- PropChangeManualAdjustWorldLevel = 13;
+ PROP_CHANGE_NONE = 0;
+ PROP_CHANGE_STATUE_RECOVER = 1;
+ PROP_CHANGE_ENERGY_BALL = 2;
+ PROP_CHANGE_ABILITY = 3;
+ PROP_CHANGE_LEVELUP = 4;
+ PROP_CHANGE_ITEM = 5;
+ PROP_CHANGE_AVATAR_CARD = 6;
+ PROP_CHANGE_CITY_LEVELUP = 7;
+ PROP_CHANGE_AVATAR_UPGRADE = 8;
+ PROP_CHANGE_AVATAR_PROMOTE = 9;
+ PROP_CHANGE_PLAYER_ADD_EXP = 10;
+ PROP_CHANGE_FINISH_QUEST = 11;
+ PROP_CHANGE_GM = 12;
+ PROP_CHANGE_MANUAL_ADJUST_WORLD_LEVEL = 13;
}
diff --git a/proto/PropPair.proto b/proto/PropPair.proto
old mode 100644
new mode 100755
index 4a5ac0e..f294e03
--- a/proto/PropPair.proto
+++ b/proto/PropPair.proto
@@ -6,5 +6,5 @@ import "PropValue.proto";
message PropPair {
uint32 type = 1;
- PropValue propValue = 2;
+ PropValue prop_value = 2;
}
diff --git a/proto/PropValue.proto b/proto/PropValue.proto
old mode 100644
new mode 100755
index 6d90551..15ff0e3
--- a/proto/PropValue.proto
+++ b/proto/PropValue.proto
@@ -2,11 +2,12 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PropValue {
- uint32 type = 1;
- oneof value {
- uint32 ival = 2;
+ oneof Value {
+ int64 ival = 2;
float fval = 3;
}
- uint32 val = 4;
+ uint32 type = 1;
+ int64 val = 4;
}
diff --git a/proto/ProtEntityType.proto b/proto/ProtEntityType.proto
old mode 100644
new mode 100755
index 9512f7d..03a451c
--- a/proto/ProtEntityType.proto
+++ b/proto/ProtEntityType.proto
@@ -3,19 +3,19 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum ProtEntityType {
- ProtEntityNone = 0;
- ProtEntityAvatar = 1;
- ProtEntityMonster = 2;
- ProtEntityNpc = 3;
- ProtEntityGadget = 4;
- ProtEntityRegion = 5;
- ProtEntityWeapon = 6;
- ProtEntityWeather = 7;
- ProtEntityScene = 8;
- ProtEntityTeam = 9;
- ProtEntityMassiveEntity = 10;
- ProtEntityMpLevel = 11;
- ProtEntityPlayTeamEntity = 12;
- ProtEntityEyePoint = 13;
- ProtEntityMax = 14;
+ PROT_ENTITY_NONE = 0;
+ PROT_ENTITY_AVATAR = 1;
+ PROT_ENTITY_MONSTER = 2;
+ PROT_ENTITY_NPC = 3;
+ PROT_ENTITY_GADGET = 4;
+ PROT_ENTITY_REGION = 5;
+ PROT_ENTITY_WEAPON = 6;
+ PROT_ENTITY_WEATHER = 7;
+ PROT_ENTITY_SCENE = 8;
+ PROT_ENTITY_TEAM = 9;
+ PROT_ENTITY_MASSIVE_ENTITY = 10;
+ PROT_ENTITY_MP_LEVEL = 11;
+ PROT_ENTITY_PLAY_TEAM_ENTITY = 12;
+ PROT_ENTITY_EYE_POINT = 13;
+ PROT_ENTITY_MAX = 14;
}
diff --git a/proto/ProudSkillChangeNotify.proto b/proto/ProudSkillChangeNotify.proto
old mode 100644
new mode 100755
index fa5ca0b..eab2578
--- a/proto/ProudSkillChangeNotify.proto
+++ b/proto/ProudSkillChangeNotify.proto
@@ -2,9 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ProudSkillChangeNotify {
- uint64 avatarGuid = 1;
- uint32 entityId = 2;
- uint32 skillDepotId = 3;
- repeated uint32 proudSkillList = 4;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1012;
+ }
+
+ uint64 avatar_guid = 1;
+ uint32 entity_id = 2;
+ uint32 skill_depot_id = 3;
+ repeated uint32 proud_skill_list = 4;
}
diff --git a/proto/ProudSkillExtraLevelNotify.proto b/proto/ProudSkillExtraLevelNotify.proto
old mode 100644
new mode 100755
index 4d612d3..77d5e66
--- a/proto/ProudSkillExtraLevelNotify.proto
+++ b/proto/ProudSkillExtraLevelNotify.proto
@@ -2,9 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ProudSkillExtraLevelNotify {
- uint64 avatarGuid = 1;
- uint32 talentType = 2;
- uint32 talentIndex = 3;
- uint32 extraLevel = 4;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1036;
+ }
+
+ uint64 avatar_guid = 1;
+ uint32 talent_type = 2;
+ uint32 talent_index = 3;
+ uint32 extra_level = 4;
}
diff --git a/proto/PullPrivateChatReq.proto b/proto/PullPrivateChatReq.proto
old mode 100644
new mode 100755
index e7d4809..8dc4d5f
--- a/proto/PullPrivateChatReq.proto
+++ b/proto/PullPrivateChatReq.proto
@@ -2,8 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message PullPrivateChatReq {
- uint32 targetUid = 1;
- uint32 fromSequence = 2;
- uint32 pullNum = 3;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 4951;
+ }
+
+ uint32 target_uid = 1;
+ uint32 from_sequence = 2;
+ uint32 pull_num = 3;
}
diff --git a/proto/PullPrivateChatRsp.proto b/proto/PullPrivateChatRsp.proto
old mode 100644
new mode 100755
index 076ef87..3a3c44c
--- a/proto/PullPrivateChatRsp.proto
+++ b/proto/PullPrivateChatRsp.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "ChatInfo.proto";
message PullPrivateChatRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 5044;
+ }
+
int32 retcode = 1;
- repeated ChatInfo chatInfo = 2;
+ repeated ChatInfo chat_info = 2;
}
diff --git a/proto/PullRecentChatRsp.proto b/proto/PullRecentChatRsp.proto
old mode 100644
new mode 100755
index 1aafd00..43ab77d
--- a/proto/PullRecentChatRsp.proto
+++ b/proto/PullRecentChatRsp.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "ChatInfo.proto";
message PullRecentChatRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 5011;
+ }
+
int32 retcode = 1;
- repeated ChatInfo chatInfo = 2;
+ repeated ChatInfo chat_info = 2;
}
diff --git a/proto/QueryCurrRegionHttpRsp.proto b/proto/QueryCurrRegionHttpRsp.proto
old mode 100644
new mode 100755
index 58c2c8b..cd8cb02
--- a/proto/QueryCurrRegionHttpRsp.proto
+++ b/proto/QueryCurrRegionHttpRsp.proto
@@ -2,13 +2,19 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+import "ForceUpdateInfo.proto";
+import "StopServerInfo.proto";
import "RegionInfo.proto";
message QueryCurrRegionHttpRsp {
- int32 retcode = 1;
- string message = 2;
- RegionInfo regionInfo = 3;
- bytes clientSecretKey = 11;
- bytes regionCustomConfigEncrypted = 12;
- bytes clientRegionCustomConfigEncrypted = 13;
+ oneof Detail {
+ ForceUpdateInfo force_udpate = 4;
+ StopServerInfo stop_server = 5;
+ }
+ int32 retcode = 1;
+ string msg = 2;
+ RegionInfo region_info = 3;
+ bytes client_secret_key = 11;
+ bytes region_custom_config_encrypted = 12;
+ bytes client_region_custom_config_encrypted = 13;
}
diff --git a/proto/QueryRegionListHttpRsp.proto b/proto/QueryRegionListHttpRsp.proto
old mode 100644
new mode 100755
index 934634f..d3ab022
--- a/proto/QueryRegionListHttpRsp.proto
+++ b/proto/QueryRegionListHttpRsp.proto
@@ -5,9 +5,9 @@ option java_package = "emu.grasscutter.net.proto";
import "RegionSimpleInfo.proto";
message QueryRegionListHttpRsp {
- uint32 retcode = 1;
- repeated RegionSimpleInfo servers = 2;
- bytes clientSecretKey = 5;
- bytes clientCustomConfigEncrypted = 6;
- bool enableLoginPc = 7;
+ int32 retcode = 1;
+ repeated RegionSimpleInfo region_list = 2;
+ bytes client_secret_key = 5;
+ bytes client_custom_config_encrypted = 6;
+ bool enable_login_pc = 7;
}
diff --git a/proto/RegionInfo.proto b/proto/RegionInfo.proto
old mode 100644
new mode 100755
index 6cad3cb..87e14d5
--- a/proto/RegionInfo.proto
+++ b/proto/RegionInfo.proto
@@ -5,25 +5,32 @@ option java_package = "emu.grasscutter.net.proto";
import "ResVersionConfig.proto";
message RegionInfo {
- string ip = 1;
- int32 port = 2;
- string payCallbackUrl = 3;
- string areaType = 7;
- string resourceUrl = 8;
- string dataUrl = 9;
- string feedbackUrl = 10;
- string bulletinUrl = 11;
- string version = 12;
- int32 clientDataVersion = 14;
- int32 clientSilenceDataVersion = 18;
- string clientDataMd5 = 19;
- string clientSilenceDataMd5 = 20;
- ResVersionConfig config = 22;
- bytes secretKey = 23;
- string communityUrl = 24;
- string clientVersionSuffix = 26;
- string clientSilenceVersionSuffix = 27;
- string accountUrl = 31;
- string cdkeyUrl = 32;
- string privacyUrl = 33;
- }
+ string gateserver_ip = 1;
+ uint32 gateserver_port = 2;
+ string pay_callback_url = 3;
+ string area_type = 7;
+ string resource_url = 8;
+ string data_url = 9;
+ string feedback_url = 10;
+ string bulletin_url = 11;
+ string resource_url_bak = 12;
+ string data_url_bak = 13;
+ uint32 client_data_version = 14;
+ string handbook_url = 16;
+ uint32 client_silence_data_version = 18;
+ string client_data_md5 = 19;
+ string client_silence_data_md5 = 20;
+ ResVersionConfig res_version_config = 22;
+ bytes secret_key = 23;
+ string official_community_url = 24;
+ string client_version_suffix = 26;
+ string client_silence_version_suffix = 27;
+ bool use_gateserver_domain_name = 28;
+ string gateserver_domain_name = 29;
+ string user_center_url = 30;
+ string account_bind_url = 31;
+ string cdkey_url = 32;
+ string privacy_policy_url = 33;
+ string next_resource_url = 34;
+ ResVersionConfig next_res_version_config = 35;
+}
diff --git a/proto/RegionSimpleInfo.proto b/proto/RegionSimpleInfo.proto
old mode 100644
new mode 100755
index 093818f..e70ade4
--- a/proto/RegionSimpleInfo.proto
+++ b/proto/RegionSimpleInfo.proto
@@ -2,9 +2,10 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message RegionSimpleInfo {
- string name = 1;
- string title = 2;
- string type = 3;
- string dispatchUrl = 4;
+ string name = 1;
+ string title = 2;
+ string type = 3;
+ string dispatch_url = 4;
}
diff --git a/proto/Reliquary.proto b/proto/Reliquary.proto
old mode 100644
new mode 100755
index 2801a5e..a38387b
--- a/proto/Reliquary.proto
+++ b/proto/Reliquary.proto
@@ -2,10 +2,11 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message Reliquary {
uint32 level = 1;
uint32 exp = 2;
- uint32 promoteLevel = 3;
- uint32 mainPropId = 4;
- repeated uint32 appendPropIdList = 5;
+ uint32 promote_level = 3;
+ uint32 main_prop_id = 4;
+ repeated uint32 append_prop_id_list = 5;
}
diff --git a/proto/ReliquaryPromoteReq.proto b/proto/ReliquaryPromoteReq.proto
old mode 100644
new mode 100755
index 1841ed8..780844b
--- a/proto/ReliquaryPromoteReq.proto
+++ b/proto/ReliquaryPromoteReq.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ReliquaryPromoteReq {
- uint64 targetGuid = 1;
- uint64 itemGuid = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 622;
+ }
+
+ uint64 target_guid = 1;
+ uint64 item_guid = 2;
}
diff --git a/proto/ReliquaryPromoteRsp.proto b/proto/ReliquaryPromoteRsp.proto
old mode 100644
new mode 100755
index 053b51e..36cd6ae
--- a/proto/ReliquaryPromoteRsp.proto
+++ b/proto/ReliquaryPromoteRsp.proto
@@ -2,11 +2,20 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ReliquaryPromoteRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 676;
+ }
+
int32 retcode = 1;
- uint64 targetReliquaryGuid = 2;
- uint32 oldPromoteLevel = 3;
- uint32 curPromoteLevel = 4;
- repeated uint32 oldAppendPropList = 5;
- repeated uint32 curAppendPropList = 6;
+ uint64 target_reliquary_guid = 2;
+ uint32 old_promote_level = 3;
+ uint32 cur_promote_level = 4;
+ repeated uint32 old_append_prop_list = 5;
+ repeated uint32 cur_append_prop_list = 6;
}
diff --git a/proto/ReliquaryUpgradeReq.proto b/proto/ReliquaryUpgradeReq.proto
old mode 100644
new mode 100755
index 468eeb9..78e136b
--- a/proto/ReliquaryUpgradeReq.proto
+++ b/proto/ReliquaryUpgradeReq.proto
@@ -5,7 +5,16 @@ option java_package = "emu.grasscutter.net.proto";
import "ItemParam.proto";
message ReliquaryUpgradeReq {
- uint64 targetReliquaryGuid = 1;
- repeated uint64 foodReliquaryGuidList = 2;
- repeated ItemParam itemParamList = 3;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 616;
+ }
+
+ uint64 target_reliquary_guid = 1;
+ repeated uint64 food_reliquary_guid_list = 2;
+ repeated ItemParam item_param_list = 3;
}
diff --git a/proto/ReliquaryUpgradeRsp.proto b/proto/ReliquaryUpgradeRsp.proto
old mode 100644
new mode 100755
index 4bcdbed..f5fe7ea
--- a/proto/ReliquaryUpgradeRsp.proto
+++ b/proto/ReliquaryUpgradeRsp.proto
@@ -2,12 +2,21 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ReliquaryUpgradeRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 696;
+ }
+
int32 retcode = 1;
- uint64 targetReliquaryGuid = 2;
- uint32 oldLevel = 3;
- uint32 curLevel = 4;
- uint32 powerUpRate = 5;
- repeated uint32 oldAppendPropList = 6;
- repeated uint32 curAppendPropList = 7;
+ uint64 target_reliquary_guid = 2;
+ uint32 old_level = 3;
+ uint32 cur_level = 4;
+ uint32 power_up_rate = 5;
+ repeated uint32 old_append_prop_list = 6;
+ repeated uint32 cur_append_prop_list = 7;
}
diff --git a/proto/ResVersionConfig.proto b/proto/ResVersionConfig.proto
old mode 100644
new mode 100755
index 71c053f..36073f2
--- a/proto/ResVersionConfig.proto
+++ b/proto/ResVersionConfig.proto
@@ -2,10 +2,13 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ResVersionConfig {
- int32 version = 1;
- string md5 = 2;
- string size = 3;
- string versionSuffix = 4;
- string branch = 5;
+ uint32 version = 1;
+ bool relogin = 2;
+ string md5 = 3;
+ string release_total_size = 4;
+ string version_suffix = 5;
+ string branch = 6;
+ string next_script_version = 7;
}
diff --git a/proto/ResinCard.proto b/proto/ResinCard.proto
old mode 100644
new mode 100755
diff --git a/proto/ResinChangeNotify.proto b/proto/ResinChangeNotify.proto
old mode 100644
new mode 100755
index bf938b4..d68c0db
--- a/proto/ResinChangeNotify.proto
+++ b/proto/ResinChangeNotify.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ResinChangeNotify {
- int32 currValue = 1;
- int32 nextAddTimestamp = 2;
- int32 curBuyCount = 3;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 611;
+ }
+
+ uint32 cur_value = 1;
+ uint32 next_add_timestamp = 2;
+ uint32 cur_buy_count = 3;
}
diff --git a/proto/ResinCostType.proto b/proto/ResinCostType.proto
old mode 100644
new mode 100755
index 1c9ac3f..92e3955
--- a/proto/ResinCostType.proto
+++ b/proto/ResinCostType.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum ResinCostType {
- CostNone = 0;
- CostNormal = 1;
- CostCondense = 2;
- CostReunionPrivilege = 3;
- CostOpActivity = 4;
- CostMaterial = 5;
+ NONE = 0;
+ NORMAL = 1;
+ CONDENSE = 2;
+ REUNION_PRIVILEGE = 3;
+ OP_ACTIVITY = 4;
+ MATERIAL = 5;
}
diff --git a/proto/Retcode.proto b/proto/Retcode.proto
new file mode 100644
index 0000000..7464e8e
--- /dev/null
+++ b/proto/Retcode.proto
@@ -0,0 +1,834 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+enum Retcode {
+ RET_SUCC = 0;
+ RET_SVR_ERROR = 1;
+ RET_UNKNOWN_ERROR = 2;
+ RET_FREQUENT = 3;
+ RET_NODE_FORWARD_ERROR = 4;
+ RET_NOT_FOUND_CONFIG = 5;
+ RET_SYSTEM_BUSY = 6;
+ RET_GM_UID_BIND = 7;
+ RET_STOP_REGISTER = 10;
+ RET_STOP_SERVER = 11;
+ RET_ACCOUNT_VEIRFY_ERROR = 12;
+ RET_ACCOUNT_FREEZE = 13;
+ RET_REPEAT_LOGIN = 14;
+ RET_CLIENT_VERSION_ERROR = 15;
+ RET_TOKEN_ERROR = 16;
+ RET_ACCOUNT_NOT_EXIST = 17;
+ RET_WAIT_OTHER_LOGIN = 18;
+ RET_ANOTHER_LOGIN = 19;
+ RET_CLIENT_FORCE_UPDATE = 20;
+ RET_BLACK_UID = 21;
+ RET_LOGIN_DB_FAIL = 22;
+ RET_LOGIN_INIT_FAIL = 23;
+ RET_MYSQL_DUPLICATE = 24;
+ RET_MAX_PLAYER = 25;
+ RET_ANTI_ADDICT = 26;
+ RET_PS_PLAYER_WITHOUT_ONLINE_ID = 27;
+ RET_ONLINE_ID_NOT_FOUND = 28;
+ RET_ONLNE_ID_NOT_MATCH = 29;
+ RET_REGISTER_IS_FULL = 30;
+ RET_CHECKSUM_INVALID = 31;
+ RET_BLACK_REGISTER_IP = 32;
+ RET_EXCEED_REGISTER_RATE = 33;
+ RET_UNKNOWN_PLATFORM = 34;
+ RET_TOKEN_PARAM_ERROR = 35;
+ RET_ANTI_OFFLINE_ERROR = 36;
+ RET_BLACK_LOGIN_IP = 37;
+ RET_GET_TOKEN_SESSION_HAS_UID = 38;
+ RET_ENVIRONMENT_ERROR = 39;
+ RET_CHECK_CLIENT_VERSION_HASH_FAIL = 40;
+ RET_AVATAR_IN_CD = 101;
+ RET_AVATAR_NOT_ALIVE = 102;
+ RET_AVATAR_NOT_ON_SCENE = 103;
+ RET_CAN_NOT_FIND_AVATAR = 104;
+ RET_CAN_NOT_DEL_CUR_AVATAR = 105;
+ RET_DUPLICATE_AVATAR = 106;
+ RET_AVATAR_IS_SAME_ONE = 107;
+ RET_AVATAR_LEVEL_LESS_THAN = 108;
+ RET_AVATAR_CAN_NOT_CHANGE_ELEMENT = 109;
+ RET_AVATAR_BREAK_LEVEL_LESS_THAN = 110;
+ RET_AVATAR_ON_MAX_BREAK_LEVEL = 111;
+ RET_AVATAR_ID_ALREADY_EXIST = 112;
+ RET_AVATAR_NOT_DEAD = 113;
+ RET_AVATAR_IS_REVIVING = 114;
+ RET_AVATAR_ID_ERROR = 115;
+ RET_REPEAT_SET_PLAYER_BORN_DATA = 116;
+ RET_PLAYER_LEVEL_LESS_THAN = 117;
+ RET_AVATAR_LIMIT_LEVEL_ERROR = 118;
+ RET_CUR_AVATAR_NOT_ALIVE = 119;
+ RET_CAN_NOT_FIND_TEAM = 120;
+ RET_CAN_NOT_FIND_CUR_TEAM = 121;
+ RET_AVATAR_NOT_EXIST_IN_TEAM = 122;
+ RET_CAN_NOT_REMOVE_CUR_AVATAR_FROM_TEAM = 123;
+ RET_CAN_NOT_USE_REVIVE_ITEM_FOR_CUR_AVATAR = 124;
+ RET_TEAM_COST_EXCEED_LIMIT = 125;
+ RET_TEAM_AVATAR_IN_EXPEDITION = 126;
+ RET_TEAM_CAN_NOT_CHOSE_REPLACE_USE = 127;
+ RET_AVATAR_IN_COMBAT = 128;
+ RET_NICKNAME_UTF8_ERROR = 130;
+ RET_NICKNAME_TOO_LONG = 131;
+ RET_NICKNAME_WORD_ILLEGAL = 132;
+ RET_NICKNAME_TOO_MANY_DIGITS = 133;
+ RET_NICKNAME_IS_EMPTY = 134;
+ RET_PLAYER_NOT_ONLINE = 140;
+ RET_OPEN_STATE_NOT_OPEN = 141;
+ RET_FEATURE_CLOSED = 142;
+ RET_AVATAR_EXPEDITION_AVATAR_DIE = 152;
+ RET_AVATAR_EXPEDITION_COUNT_LIMIT = 153;
+ RET_AVATAR_EXPEDITION_MAIN_FORBID = 154;
+ RET_AVATAR_EXPEDITION_TRIAL_FORBID = 155;
+ RET_TEAM_NAME_ILLEGAL = 156;
+ RET_IS_NOT_IN_STANDBY = 157;
+ RET_IS_IN_DUNGEON = 158;
+ RET_IS_IN_LOCK_AVATAR_QUEST = 159;
+ RET_IS_USING_TRIAL_AVATAR = 160;
+ RET_IS_USING_TEMP_AVATAR = 161;
+ RET_NOT_HAS_FLYCLOAK = 162;
+ RET_FETTER_REWARD_ALREADY_GOT = 163;
+ RET_FETTER_REWARD_LEVEL_NOT_ENOUGH = 164;
+ RET_WORLD_LEVEL_ADJUST_MIN_LEVEL = 165;
+ RET_WORLD_LEVEL_ADJUST_CD = 166;
+ RET_NOT_HAS_COSTUME = 167;
+ RET_COSTUME_AVATAR_ERROR = 168;
+ RET_FLYCLOAK_PLATFORM_TYPE_ERR = 169;
+ RET_FLOAT_ERROR = 201;
+ RET_NPC_NOT_EXIST = 301;
+ RET_NPC_TOO_FAR = 302;
+ RET_NOT_CURRENT_TALK = 303;
+ RET_NPC_CREATE_FAIL = 304;
+ RET_NPC_MOVE_FAIL = 305;
+ RET_QUEST_NOT_EXIST = 401;
+ RET_QUEST_IS_FAIL = 402;
+ RET_QUEST_CONTENT_ERROR = 403;
+ RET_BARGAIN_NOT_ACTIVATED = 404;
+ RET_BARGAIN_FINISHED = 405;
+ RET_POINT_NOT_UNLOCKED = 501;
+ RET_POINT_TOO_FAR = 502;
+ RET_POINT_ALREAY_UNLOCKED = 503;
+ RET_ENTITY_NOT_EXIST = 504;
+ RET_ENTER_SCENE_FAIL = 505;
+ RET_PLAYER_IS_ENTER_SCENE = 506;
+ RET_CITY_MAX_LEVEL = 507;
+ RET_AREA_LOCKED = 508;
+ RET_JOIN_OTHER_WAIT = 509;
+ RET_WEATHER_AREA_NOT_FOUND = 510;
+ RET_WEATHER_IS_LOCKED = 511;
+ RET_NOT_IN_SELF_SCENE = 512;
+ RET_GROUP_NOT_EXIST = 513;
+ RET_MARK_NAME_ILLEGAL = 514;
+ RET_MARK_ALREADY_EXISTS = 515;
+ RET_MARK_OVERFLOW = 516;
+ RET_MARK_NOT_EXISTS = 517;
+ RET_MARK_UNKNOWN_TYPE = 518;
+ RET_MARK_NAME_TOO_LONG = 519;
+ RET_DISTANCE_LONG = 520;
+ RET_ENTER_SCENE_TOKEN_INVALID = 521;
+ RET_NOT_IN_WORLD_SCENE = 522;
+ RET_ANY_GALLERY_STARTED = 523;
+ RET_GALLERY_NOT_START = 524;
+ RET_GALLERY_INTERRUPT_ONLY_ON_SINGLE_MODE = 525;
+ RET_GALLERY_CANNOT_INTERRUPT = 526;
+ RET_GALLERY_WORLD_NOT_MEET = 527;
+ RET_GALLERY_SCENE_NOT_MEET = 528;
+ RET_CUR_PLAY_CANNOT_TRANSFER = 529;
+ RET_CANT_USE_WIDGET_IN_HOME_SCENE = 530;
+ RET_SCENE_GROUP_NOT_MATCH = 531;
+ RET_POS_ROT_INVALID = 551;
+ RET_MARK_INVALID_SCENE_ID = 552;
+ RET_INVALID_SCENE_TO_USE_ANCHOR_POINT = 553;
+ RET_ENTER_HOME_SCENE_FAIL = 554;
+ RET_CUR_SCENE_IS_NULL = 555;
+ RET_GROUP_ID_ERROR = 556;
+ RET_ITEM_NOT_EXIST = 601;
+ RET_PACK_EXCEED_MAX_WEIGHT = 602;
+ RET_ITEM_NOT_DROPABLE = 603;
+ RET_ITEM_NOT_USABLE = 604;
+ RET_ITEM_INVALID_USE_COUNT = 605;
+ RET_ITEM_INVALID_DROP_COUNT = 606;
+ RET_ITEM_ALREADY_EXIST = 607;
+ RET_ITEM_IN_COOLDOWN = 608;
+ RET_ITEM_COUNT_NOT_ENOUGH = 609;
+ RET_ITEM_INVALID_TARGET = 610;
+ RET_RECIPE_NOT_EXIST = 611;
+ RET_RECIPE_LOCKED = 612;
+ RET_RECIPE_UNLOCKED = 613;
+ RET_COMPOUND_QUEUE_FULL = 614;
+ RET_COMPOUND_NOT_FINISH = 615;
+ RET_MAIL_ITEM_NOT_GET = 616;
+ RET_ITEM_EXCEED_LIMIT = 617;
+ RET_AVATAR_CAN_NOT_USE = 618;
+ RET_ITEM_NEED_PLAYER_LEVEL = 619;
+ RET_RECIPE_NOT_AUTO_QTE = 620;
+ RET_COMPOUND_BUSY_QUEUE = 621;
+ RET_NEED_MORE_SCOIN = 622;
+ RET_SKILL_DEPOT_NOT_FOUND = 623;
+ RET_HCOIN_NOT_ENOUGH = 624;
+ RET_SCOIN_NOT_ENOUGH = 625;
+ RET_HCOIN_EXCEED_LIMIT = 626;
+ RET_SCOIN_EXCEED_LIMIT = 627;
+ RET_MAIL_EXPIRED = 628;
+ RET_REWARD_HAS_TAKEN = 629;
+ RET_COMBINE_COUNT_TOO_LARGE = 630;
+ RET_GIVING_ITEM_WRONG = 631;
+ RET_GIVING_IS_FINISHED = 632;
+ RET_GIVING_NOT_ACTIVED = 633;
+ RET_FORGE_QUEUE_FULL = 634;
+ RET_FORGE_QUEUE_CAPACITY = 635;
+ RET_FORGE_QUEUE_NOT_FOUND = 636;
+ RET_FORGE_QUEUE_EMPTY = 637;
+ RET_NOT_SUPPORT_ITEM = 638;
+ RET_ITEM_EMPTY = 639;
+ RET_VIRTUAL_EXCEED_LIMIT = 640;
+ RET_MATERIAL_EXCEED_LIMIT = 641;
+ RET_EQUIP_EXCEED_LIMIT = 642;
+ RET_ITEM_SHOULD_HAVE_NO_LEVEL = 643;
+ RET_WEAPON_PROMOTE_LEVEL_EXCEED_LIMIT = 644;
+ RET_WEAPON_LEVEL_INVALID = 645;
+ RET_UNKNOW_ITEM_TYPE = 646;
+ RET_ITEM_COUNT_IS_ZERO = 647;
+ RET_ITEM_IS_EXPIRED = 648;
+ RET_ITEM_EXCEED_OUTPUT_LIMIT = 649;
+ RET_EQUIP_LEVEL_HIGHER = 650;
+ RET_EQUIP_CAN_NOT_WAKE_OFF_WEAPON = 651;
+ RET_EQUIP_HAS_BEEN_WEARED = 652;
+ RET_EQUIP_WEARED_CANNOT_DROP = 653;
+ RET_AWAKEN_LEVEL_MAX = 654;
+ RET_MCOIN_NOT_ENOUGH = 655;
+ RET_MCOIN_EXCEED_LIMIT = 656;
+ RET_RESIN_NOT_ENOUGH = 660;
+ RET_RESIN_EXCEED_LIMIT = 661;
+ RET_RESIN_OPENSTATE_OFF = 662;
+ RET_RESIN_BOUGHT_COUNT_EXCEEDED = 663;
+ RET_RESIN_CARD_DAILY_REWARD_HAS_TAKEN = 664;
+ RET_RESIN_CARD_EXPIRED = 665;
+ RET_AVATAR_CAN_NOT_COOK = 666;
+ RET_ATTACH_AVATAR_CD = 667;
+ RET_AUTO_RECOVER_OPENSTATE_OFF = 668;
+ RET_AUTO_RECOVER_BOUGHT_COUNT_EXCEEDED = 669;
+ RET_RESIN_GAIN_FAILED = 670;
+ RET_WIDGET_ORNAMENTS_TYPE_ERROR = 671;
+ RET_ALL_TARGET_SATIATION_FULL = 672;
+ RET_FORGE_WORLD_LEVEL_NOT_MATCH = 673;
+ RET_FORGE_POINT_NOT_ENOUGH = 674;
+ RET_WIDGET_ANCHOR_POINT_FULL = 675;
+ RET_WIDGET_ANCHOR_POINT_NOT_FOUND = 676;
+ RET_ALL_BONFIRE_EXCEED_MAX_COUNT = 677;
+ RET_BONFIRE_EXCEED_MAX_COUNT = 678;
+ RET_LUNCH_BOX_DATA_ERROR = 679;
+ RET_INVALID_QUICK_USE_WIDGET = 680;
+ RET_INVALID_REPLACE_RESIN_COUNT = 681;
+ RET_PREV_DETECTED_GATHER_NOT_FOUND = 682;
+ RET_GOT_ALL_ONEOFF_GAHTER = 683;
+ RET_INVALID_WIDGET_MATERIAL_ID = 684;
+ RET_WIDGET_DETECTOR_NO_HINT_TO_CLEAR = 685;
+ RET_WIDGET_ALREADY_WITHIN_NEARBY_RADIUS = 686;
+ RET_WIDGET_CLIENT_COLLECTOR_NEED_POINTS = 687;
+ RET_WIDGET_IN_COMBAT = 688;
+ RET_WIDGET_NOT_SET_QUICK_USE = 689;
+ RET_ALREADY_ATTACH_WIDGET = 690;
+ RET_EQUIP_IS_LOCKED = 691;
+ RET_FORGE_IS_LOCKED = 692;
+ RET_COMBINE_IS_LOCKED = 693;
+ RET_FORGE_OUTPUT_STACK_LIMIT = 694;
+ RET_ALREADY_DETTACH_WIDGET = 695;
+ RET_GADGET_BUILDER_EXCEED_MAX_COUNT = 696;
+ RET_REUNION_PRIVILEGE_RESIN_TYPE_IS_NORMAL = 697;
+ RET_BONUS_COUNT_EXCEED_DOUBLE_LIMIT = 698;
+ RET_RELIQUARY_DECOMPOSE_PARAM_ERROR = 699;
+ RET_ITEM_COMBINE_COUNT_NOT_ENOUGH = 700;
+ RET_GOODS_NOT_EXIST = 701;
+ RET_GOODS_MATERIAL_NOT_ENOUGH = 702;
+ RET_GOODS_NOT_IN_TIME = 703;
+ RET_GOODS_BUY_NUM_NOT_ENOUGH = 704;
+ RET_GOODS_BUY_NUM_ERROR = 705;
+ RET_SHOP_NOT_OPEN = 706;
+ RET_SHOP_CONTENT_NOT_MATCH = 707;
+ RET_CHAT_FORBIDDEN = 798;
+ RET_CHAT_CD = 799;
+ RET_CHAT_FREQUENTLY = 800;
+ RET_GADGET_NOT_EXIST = 801;
+ RET_GADGET_NOT_INTERACTIVE = 802;
+ RET_GADGET_NOT_GATHERABLE = 803;
+ RET_CHEST_IS_LOCKED = 804;
+ RET_GADGET_CREATE_FAIL = 805;
+ RET_WORKTOP_OPTION_NOT_EXIST = 806;
+ RET_GADGET_STATUE_NOT_ACTIVE = 807;
+ RET_GADGET_STATUE_OPENED = 808;
+ RET_BOSS_CHEST_NO_QUALIFICATION = 809;
+ RET_BOSS_CHEST_LIFE_TIME_OVER = 810;
+ RET_BOSS_CHEST_WEEK_NUM_LIMIT = 811;
+ RET_BOSS_CHEST_GUEST_WORLD_LEVEL = 812;
+ RET_BOSS_CHEST_HAS_TAKEN = 813;
+ RET_BLOSSOM_CHEST_NO_QUALIFICATION = 814;
+ RET_BLOSSOM_CHEST_LIFE_TIME_OVER = 815;
+ RET_BLOSSOM_CHEST_HAS_TAKEN = 816;
+ RET_BLOSSOM_CHEST_GUEST_WORLD_LEVEL = 817;
+ RET_MP_PLAY_REWARD_NO_QUALIFICATION = 818;
+ RET_MP_PLAY_REWARD_HAS_TAKEN = 819;
+ RET_GENERAL_REWARD_NO_QUALIFICATION = 820;
+ RET_GENERAL_REWARD_LIFE_TIME_OVER = 821;
+ RET_GENERAL_REWARD_HAS_TAKEN = 822;
+ RET_GADGET_NOT_VEHICLE = 823;
+ RET_VEHICLE_SLOT_OCCUPIED = 824;
+ RET_NOT_IN_VEHICLE = 825;
+ RET_CREATE_VEHICLE_IN_CD = 826;
+ RET_CREATE_VEHICLE_POS_INVALID = 827;
+ RET_VEHICLE_POINT_NOT_UNLOCK = 828;
+ RET_GADGET_INTERACT_COND_NOT_MEET = 829;
+ RET_GADGET_INTERACT_PARAM_ERROR = 830;
+ RET_ACTIVITY_CLOSE = 860;
+ RET_ACTIVITY_ITEM_ERROR = 861;
+ RET_ACTIVITY_CONTRIBUTION_NOT_ENOUGH = 862;
+ RET_SEA_LAMP_PHASE_NOT_FINISH = 863;
+ RET_SEA_LAMP_FLY_NUM_LIMIT = 864;
+ RET_SEA_LAMP_FLY_LAMP_WORD_ILLEGAL = 865;
+ RET_ACTIVITY_WATCHER_REWARD_TAKEN = 866;
+ RET_ACTIVITY_WATCHER_REWARD_NOT_FINISHED = 867;
+ RET_SALESMAN_ALREADY_DELIVERED = 868;
+ RET_SALESMAN_REWARD_COUNT_NOT_ENOUGH = 869;
+ RET_SALESMAN_POSITION_INVALID = 870;
+ RET_DELIVER_NOT_FINISH_ALL_QUEST = 871;
+ RET_DELIVER_ALREADY_TAKE_DAILY_REWARD = 872;
+ RET_ASTER_PROGRESS_EXCEED_LIMIT = 873;
+ RET_ASTER_CREDIT_EXCEED_LIMIT = 874;
+ RET_ASTER_TOKEN_EXCEED_LIMIT = 875;
+ RET_ASTER_CREDIT_NOT_ENOUGH = 876;
+ RET_ASTER_TOKEN_NOT_ENOUGH = 877;
+ RET_ASTER_SPECIAL_REWARD_HAS_TAKEN = 878;
+ RET_FLIGHT_GROUP_ACTIVITY_NOT_STARTED = 879;
+ RET_ASTER_MID_PREVIOUS_BATTLE_NOT_FINISHED = 880;
+ RET_DRAGON_SPINE_SHIMMERING_ESSENCE_EXCEED_LIMIT = 881;
+ RET_DRAGON_SPINE_WARM_ESSENCE_EXCEED_LIMIT = 882;
+ RET_DRAGON_SPINE_WONDROUS_ESSENCE_EXCEED_LIMIT = 883;
+ RET_DRAGON_SPINE_SHIMMERING_ESSENCE_NOT_ENOUGH = 884;
+ RET_DRAGON_SPINE_WARM_ESSENCE_NOT_ENOUGH = 885;
+ RET_DRAGON_SPINE_WONDROUS_ESSENCE_NOT_ENOUGH = 886;
+ RET_EFFIGY_FIRST_PASS_REWARD_HAS_TAKEN = 891;
+ RET_EFFIGY_REWARD_HAS_TAKEN = 892;
+ RET_TREASURE_MAP_ADD_TOKEN_EXCEED_LIMIT = 893;
+ RET_TREASURE_MAP_TOKEN_NOT_ENOUGHT = 894;
+ RET_SEA_LAMP_COIN_EXCEED_LIMIT = 895;
+ RET_SEA_LAMP_COIN_NOT_ENOUGH = 896;
+ RET_SEA_LAMP_POPULARITY_EXCEED_LIMIT = 897;
+ RET_ACTIVITY_AVATAR_REWARD_NOT_OPEN = 898;
+ RET_ACTIVITY_AVATAR_REWARD_HAS_TAKEN = 899;
+ RET_ARENA_ACTIVITY_ALREADY_STARTED = 900;
+ RET_TALENT_ALREAY_UNLOCKED = 901;
+ RET_PREV_TALENT_NOT_UNLOCKED = 902;
+ RET_BIG_TALENT_POINT_NOT_ENOUGH = 903;
+ RET_SMALL_TALENT_POINT_NOT_ENOUGH = 904;
+ RET_PROUD_SKILL_ALREADY_GOT = 905;
+ RET_PREV_PROUD_SKILL_NOT_GET = 906;
+ RET_PROUD_SKILL_MAX_LEVEL = 907;
+ RET_CANDIDATE_SKILL_DEPOT_ID_NOT_FIND = 910;
+ RET_SKILL_DEPOT_IS_THE_SAME = 911;
+ RET_MONSTER_NOT_EXIST = 1001;
+ RET_MONSTER_CREATE_FAIL = 1002;
+ RET_DUNGEON_ENTER_FAIL = 1101;
+ RET_DUNGEON_QUIT_FAIL = 1102;
+ RET_DUNGEON_ENTER_EXCEED_DAY_COUNT = 1103;
+ RET_DUNGEON_REVIVE_EXCEED_MAX_COUNT = 1104;
+ RET_DUNGEON_REVIVE_FAIL = 1105;
+ RET_DUNGEON_NOT_SUCCEED = 1106;
+ RET_DUNGEON_CAN_NOT_CANCEL = 1107;
+ RET_DEST_DUNGEON_SETTLED = 1108;
+ RET_DUNGEON_CANDIDATE_TEAM_IS_FULL = 1109;
+ RET_DUNGEON_CANDIDATE_TEAM_IS_DISMISS = 1110;
+ RET_DUNGEON_CANDIDATE_TEAM_NOT_ALL_READY = 1111;
+ RET_DUNGEON_CANDIDATE_TEAM_HAS_REPEAT_AVATAR = 1112;
+ RET_DUNGEON_CANDIDATE_NOT_SINGEL_PASS = 1113;
+ RET_DUNGEON_REPLAY_NEED_ALL_PLAYER_DIE = 1114;
+ RET_DUNGEON_REPLAY_HAS_REVIVE_COUNT = 1115;
+ RET_DUNGEON_OTHERS_LEAVE = 1116;
+ RET_DUNGEON_ENTER_LEVEL_LIMIT = 1117;
+ RET_DUNGEON_CANNOT_ENTER_PLOT_IN_MP = 1118;
+ RET_DUNGEON_DROP_SUBFIELD_LIMIT = 1119;
+ RET_DUNGEON_BE_INVITE_PLAYER_AVATAR_ALL_DIE = 1120;
+ RET_DUNGEON_CANNOT_KICK = 1121;
+ RET_DUNGEON_CANDIDATE_TEAM_SOMEONE_LEVEL_LIMIT = 1122;
+ RET_DUNGEON_IN_FORCE_QUIT = 1123;
+ RET_DUNGEON_GUEST_QUIT_DUNGEON = 1124;
+ RET_DUNGEON_TICKET_FAIL = 1125;
+ RET_MP_NOT_IN_MY_WORLD = 1201;
+ RET_MP_IN_MP_MODE = 1202;
+ RET_MP_SCENE_IS_FULL = 1203;
+ RET_MP_MODE_NOT_AVAILABLE = 1204;
+ RET_MP_PLAYER_NOT_ENTERABLE = 1205;
+ RET_MP_QUEST_BLOCK_MP = 1206;
+ RET_MP_IN_ROOM_SCENE = 1207;
+ RET_MP_WORLD_IS_FULL = 1208;
+ RET_MP_PLAYER_NOT_ALLOW_ENTER = 1209;
+ RET_MP_PLAYER_DISCONNECTED = 1210;
+ RET_MP_NOT_IN_MP_MODE = 1211;
+ RET_MP_OWNER_NOT_ENTER = 1212;
+ RET_MP_ALLOW_ENTER_PLAYER_FULL = 1213;
+ RET_MP_TARGET_PLAYER_IN_TRANSFER = 1214;
+ RET_MP_TARGET_ENTERING_OTHER = 1215;
+ RET_MP_OTHER_ENTERING = 1216;
+ RET_MP_ENTER_MAIN_PLAYER_IN_PLOT = 1217;
+ RET_MP_NOT_PS_PLAYER = 1218;
+ RET_MP_PLAY_NOT_ACTIVE = 1219;
+ RET_MP_PLAY_REMAIN_REWARDS = 1220;
+ RET_MP_PLAY_NO_REWARD = 1221;
+ RET_MP_OPEN_STATE_FAIL = 1223;
+ RET_MP_PLAYER_IN_BLACKLIST = 1224;
+ RET_MP_REPLY_TIMEOUT = 1225;
+ RET_MP_IS_BLOCK = 1226;
+ RET_MP_ENTER_MAIN_PLAYER_IN_MP_PLAY = 1227;
+ RET_MP_IN_MP_PLAY_BATTLE = 1228;
+ RET_MP_GUEST_HAS_REWARD_REMAINED = 1229;
+ RET_MP_QUIT_MP_INVALID = 1230;
+ RET_MP_OTHER_DATA_VERSION_NOT_LATEST = 1231;
+ RET_MP_DATA_VERSION_NOT_LATEST = 1232;
+ RET_MP_CUR_WORLD_NOT_ENTERABLE = 1233;
+ RET_MP_ANY_GALLERY_STARTED = 1234;
+ RET_MP_HAS_ACTIVE_DRAFT = 1235;
+ RET_MP_PLAYER_IN_DUNGEON = 1236;
+ RET_MP_MATCH_FULL = 1237;
+ RET_MP_MATCH_LIMIT = 1238;
+ RET_MP_MATCH_IN_PUNISH = 1239;
+ RET_MP_IS_IN_MULTISTAGE = 1240;
+ RET_MP_MATCH_PLAY_NOT_OPEN = 1241;
+ RET_MP_ONLY_MP_WITH_PS_PLAYER = 1242;
+ RET_MP_GUEST_LOADING_FIRST_ENTER = 1243;
+ RET_MP_SUMMER_TIME_SPRINT_BOAT_ONGOING = 1244;
+ RET_MP_BLITZ_RUSH_PARKOUR_CHALLENGE_ONGOING = 1245;
+ RET_MP_MUSIC_GAME_ONGOING = 1246;
+ RET_MAIL_PARA_ERR = 1301;
+ RET_MAIL_MAX_NUM = 1302;
+ RET_MAIL_ITEM_NUM_EXCEED = 1303;
+ RET_MAIL_TITLE_LEN_EXCEED = 1304;
+ RET_MAIL_CONTENT_LEN_EXCEED = 1305;
+ RET_MAIL_SENDER_LEN_EXCEED = 1306;
+ RET_MAIL_PARSE_PACKET_FAIL = 1307;
+ RET_OFFLINE_MSG_MAX_NUM = 1308;
+ RET_OFFLINE_MSG_SAME_TICKET = 1309;
+ RET_MAIL_EXCEL_MAIL_TYPE_ERROR = 1310;
+ RET_MAIL_CANNOT_SEND_MCOIN = 1311;
+ RET_MAIL_HCOIN_EXCEED_LIMIT = 1312;
+ RET_MAIL_SCOIN_EXCEED_LIMIT = 1313;
+ RET_MAIL_MATERIAL_ID_INVALID = 1314;
+ RET_MAIL_AVATAR_EXCEED_LIMIT = 1315;
+ RET_MAIL_GACHA_TICKET_ETC_EXCEED_LIMIT = 1316;
+ RET_MAIL_ITEM_EXCEED_CEHUA_LIMIT = 1317;
+ RET_MAIL_SPACE_OR_REST_NUM_NOT_ENOUGH = 1318;
+ RET_MAIL_TICKET_IS_EMPTY = 1319;
+ RET_MAIL_TRANSACTION_IS_EMPTY = 1320;
+ RET_DAILY_TASK_NOT_FINISH = 1330;
+ RET_DAILY_TAKS_HAS_TAKEN = 1331;
+ RET_SOCIAL_OFFLINE_MSG_NUM_EXCEED = 1332;
+ RET_DAILY_TASK_FILTER_CITY_NOT_OPEN = 1333;
+ RET_GACHA_INAVAILABLE = 1401;
+ RET_GACHA_RANDOM_NOT_MATCH = 1402;
+ RET_GACHA_SCHEDULE_NOT_MATCH = 1403;
+ RET_GACHA_INVALID_TIMES = 1404;
+ RET_GACHA_COST_ITEM_NOT_ENOUGH = 1405;
+ RET_GACHA_TIMES_LIMIT = 1406;
+ RET_GACHA_WISH_SAME_ITEM = 1407;
+ RET_GACHA_WISH_INVALID_ITEM = 1408;
+ RET_INVESTIGAITON_NOT_IN_PROGRESS = 1501;
+ RET_INVESTIGAITON_UNCOMPLETE = 1502;
+ RET_INVESTIGAITON_REWARD_TAKEN = 1503;
+ RET_INVESTIGAITON_TARGET_STATE_ERROR = 1504;
+ RET_PUSH_TIPS_NOT_FOUND = 1505;
+ RET_SIGN_IN_RECORD_NOT_FOUND = 1506;
+ RET_ALREADY_HAVE_SIGNED_IN = 1507;
+ RET_SIGN_IN_COND_NOT_SATISFIED = 1508;
+ RET_BONUS_ACTIVITY_NOT_UNREWARDED = 1509;
+ RET_SIGN_IN_REWARDED = 1510;
+ RET_TOWER_NOT_OPEN = 1521;
+ RET_TOWER_HAVE_DAILY_RECORD = 1522;
+ RET_TOWER_NOT_RECORD = 1523;
+ RET_TOWER_HAVE_RECORD = 1524;
+ RET_TOWER_TEAM_NUM_ERROR = 1525;
+ RET_TOWER_FLOOR_NOT_OPEN = 1526;
+ RET_TOWER_NO_FLOOR_STAR_RECORD = 1527;
+ RET_ALREADY_HAS_TOWER_BUFF = 1528;
+ RET_DUPLICATE_ENTER_LEVEL = 1529;
+ RET_NOT_IN_TOWER_LEVEL = 1530;
+ RET_IN_TOWER_LEVEL = 1531;
+ RET_TOWER_PREV_FLOOR_NOT_FINISH = 1532;
+ RET_TOWER_STAR_NOT_ENOUGH = 1533;
+ RET_BATTLE_PASS_NO_SCHEDULE = 1541;
+ RET_BATTLE_PASS_HAS_BUYED = 1542;
+ RET_BATTLE_PASS_LEVEL_OVERFLOW = 1543;
+ RET_BATTLE_PASS_PRODUCT_EXPIRED = 1544;
+ RET_MATCH_HOST_QUIT = 1561;
+ RET_MATCH_ALREADY_IN_MATCH = 1562;
+ RET_MATCH_NOT_IN_MATCH = 1563;
+ RET_MATCH_APPLYING_ENTER_MP = 1564;
+ RET_WIDGET_TREASURE_SPOT_NOT_FOUND = 1581;
+ RET_WIDGET_TREASURE_ENTITY_EXISTS = 1582;
+ RET_WIDGET_TREASURE_SPOT_FAR_AWAY = 1583;
+ RET_WIDGET_TREASURE_FINISHED_TODAY = 1584;
+ RET_WIDGET_QUICK_USE_REQ_PARAM_ERROR = 1585;
+ RET_WIDGET_CAMERA_SCAN_ID_ERROR = 1586;
+ RET_WIDGET_NOT_ACTIVE = 1587;
+ RET_WIDGET_FEATHER_NOT_ACTIVE = 1588;
+ RET_WIDGET_FEATHER_GADGET_TOO_FAR_AWAY = 1589;
+ RET_UID_NOT_EXIST = 2001;
+ RET_PARSE_BIN_ERROR = 2002;
+ RET_ACCOUNT_INFO_NOT_EXIST = 2003;
+ RET_ORDER_INFO_NOT_EXIST = 2004;
+ RET_SNAPSHOT_INDEX_ERROR = 2005;
+ RET_MAIL_HAS_BEEN_SENT = 2006;
+ RET_PRODUCT_NOT_EXIST = 2007;
+ RET_UNFINISH_ORDER = 2008;
+ RET_ID_NOT_EXIST = 2009;
+ RET_ORDER_TRADE_EARLY = 2010;
+ RET_ORDER_FINISHED = 2011;
+ RET_GAMESERVER_VERSION_WRONG = 2012;
+ RET_OFFLINE_OP_FULL_LENGTH = 2013;
+ RET_CONCERT_PRODUCT_OBTAIN_LIMIT = 2014;
+ RET_CONCERT_PRODUCT_TICKET_DUPLICATED = 2015;
+ RET_CONCERT_PRODUCT_TICKET_EMPTY = 2016;
+ RET_REDIS_MODIFIED = 5001;
+ RET_REDIS_UID_NOT_EXIST = 5002;
+ RET_PATHFINDING_DATA_NOT_EXIST = 6001;
+ RET_PATHFINDING_DESTINATION_NOT_EXIST = 6002;
+ RET_PATHFINDING_ERROR_SCENE = 6003;
+ RET_PATHFINDING_SCENE_DATA_LOADING = 6004;
+ RET_FRIEND_COUNT_EXCEEDED = 7001;
+ RET_PLAYER_NOT_EXIST = 7002;
+ RET_ALREADY_SENT_ADD_REQUEST = 7003;
+ RET_ASK_FRIEND_LIST_FULL = 7004;
+ RET_PLAYER_ALREADY_IS_FRIEND = 7005;
+ RET_PLAYER_NOT_ASK_FRIEND = 7006;
+ RET_TARGET_FRIEND_COUNT_EXCEED = 7007;
+ RET_NOT_FRIEND = 7008;
+ RET_BIRTHDAY_CANNOT_BE_SET_TWICE = 7009;
+ RET_CANNOT_ADD_SELF_FRIEND = 7010;
+ RET_SIGNATURE_ILLEGAL = 7011;
+ RET_PS_PLAYER_CANNOT_ADD_FRIENDS = 7012;
+ RET_PS_PLAYER_CANNOT_REMOVE_FRIENDS = 7013;
+ RET_NAME_CARD_NOT_UNLOCKED = 7014;
+ RET_ALREADY_IN_BLACKLIST = 7015;
+ RET_PS_PALEYRS_CANNOT_ADD_BLACKLIST = 7016;
+ RET_PLAYER_BLACKLIST_FULL = 7017;
+ RET_PLAYER_NOT_IN_BLACKLIST = 7018;
+ RET_BLACKLIST_PLAYER_CANNOT_ADD_FRIEND = 7019;
+ RET_IN_TARGET_BLACKLIST = 7020;
+ RET_CANNOT_ADD_TARGET_FRIEND = 7021;
+ RET_BIRTHDAY_FORMAT_ERROR = 7022;
+ RET_ONLINE_ID_NOT_EXISTS = 7023;
+ RET_FIRST_SHARE_REWARD_HAS_TAKEN = 7024;
+ RET_PS_PLAYER_CANNOT_REMOVE_BLACKLIST = 7025;
+ RET_REPORT_CD = 7026;
+ RET_REPORT_CONTENT_ILLEGAL = 7027;
+ RET_REMARK_WORD_ILLEGAL = 7028;
+ RET_REMARK_TOO_LONG = 7029;
+ RET_REMARK_UTF8_ERROR = 7030;
+ RET_REMARK_IS_EMPTY = 7031;
+ RET_ASK_ADD_FRIEND_CD = 7032;
+ RET_SHOW_AVATAR_INFO_NOT_EXIST = 7033;
+ RET_PLAYER_NOT_SHOW_AVATAR = 7034;
+ RET_SOCIAL_UPDATE_SHOW_LIST_REPEAT_ID = 7035;
+ RET_PSN_ID_NOT_FOUND = 7036;
+ RET_EMOJI_COLLECTION_NUM_EXCEED_LIMIT = 7037;
+ RET_REMARK_EMPTY = 7038;
+ RET_OFFERING_NOT_OPEN = 7081;
+ RET_OFFERING_LEVEL_LIMIT = 7082;
+ RET_OFFERING_LEVEL_NOT_REACH = 7083;
+ RET_OFFERING_LEVEL_HAS_TAKEN = 7084;
+ RET_CITY_REPUTATION_NOT_OPEN = 7101;
+ RET_CITY_REPUTATION_LEVEL_TAKEN = 7102;
+ RET_CITY_REPUTATION_LEVEL_NOT_REACH = 7103;
+ RET_CITY_REPUTATION_PARENT_QUEST_TAKEN = 7104;
+ RET_CITY_REPUTATION_PARENT_QUEST_UNFINISH = 7105;
+ RET_CITY_REPUTATION_ACCEPT_REQUEST = 7106;
+ RET_CITY_REPUTATION_NOT_ACCEPT_REQUEST = 7107;
+ RET_CITY_REPUTATION_ACCEPT_REQUEST_LIMIT = 7108;
+ RET_CITY_REPUTATION_ENTRANCE_NOT_OPEN = 7109;
+ RET_CITY_REPUTATION_TAKEN_REQUEST_REWARD = 7110;
+ RET_CITY_REPUTATION_SWITCH_CLOSE = 7111;
+ RET_CITY_REPUTATION_ENTRACE_SWITCH_CLOSE = 7112;
+ RET_CITY_REPUTATION_TAKEN_EXPLORE_REWARD = 7113;
+ RET_CITY_REPUTATION_EXPLORE_NOT_REACH = 7114;
+ RET_MECHANICUS_NOT_OPEN = 7120;
+ RET_MECHANICUS_GEAR_UNLOCK = 7121;
+ RET_MECHANICUS_GEAR_LOCK = 7122;
+ RET_MECHANICUS_GEAR_LEVEL_LIMIT = 7123;
+ RET_MECHANICUS_COIN_NOT_ENOUGH = 7124;
+ RET_MECHANICUS_NO_SEQUENCE = 7125;
+ RET_MECHANICUS_SEQUENCE_LIMIT_LEVEL = 7126;
+ RET_MECHANICUS_SEQUENCE_LIMIT_OPEN = 7127;
+ RET_MECHANICUS_DIFFICULT_NOT_SUPPORT = 7128;
+ RET_MECHANICUS_TICKET_NOT_ENOUGH = 7129;
+ RET_MECHANICUS_TEACH_NOT_FINISH = 7130;
+ RET_MECHANICUS_TEACH_FINISHED = 7131;
+ RET_MECHANICUS_PREV_DIFFICULT_LEVEL_BLOCK = 7132;
+ RET_MECHANICUS_PLAYER_LIMIT = 7133;
+ RET_MECHANICUS_PUNISH_TIME = 7134;
+ RET_MECHANICUS_SWITCH_CLOSE = 7135;
+ RET_MECHANICUS_BATTLE_NOT_IN_DUNGEON = 7150;
+ RET_MECHANICUS_BATTLE_PLAY_NOT_FOUND = 7151;
+ RET_MECHANICUS_BATTLE_DUPLICATE_PICK_CARD = 7152;
+ RET_MECHANICUS_BATTLE_PLAYER_NOT_IN_PLAY = 7153;
+ RET_MECHANICUS_BATTLE_CARD_NOT_AVAILABLE = 7154;
+ RET_MECHANICUS_BATTLE_NOT_IN_CARD_STAGE = 7155;
+ RET_MECHANICUS_BATTLE_CARD_IS_WAITING = 7156;
+ RET_MECHANICUS_BATTLE_CARD_ALL_CONFIRMED = 7157;
+ RET_MECHANICUS_BATTLE_CARD_ALREADY_CONFIRMED = 7158;
+ RET_MECHANICUS_BATTLE_CARD_CONFIRMED_BY_OTHER = 7159;
+ RET_MECHANICUS_BATTLE_CARD_NOT_ENOUGH_POINTS = 7160;
+ RET_MECHANICUS_BATTLE_CARD_ALREADY_SKIPPED = 7161;
+ RET_LEGENDARY_KEY_NOT_ENOUGH = 8001;
+ RET_LEGENDARY_KEY_EXCEED_LIMIT = 8002;
+ RET_DAILY_TASK_NOT_ENOUGH_TO_REDEEM = 8003;
+ RET_PERSONAL_LINE_OPEN_STATE_OFF = 8004;
+ RET_PERSONAL_LINE_LEVEL_NOT_ENOUGH = 8005;
+ RET_PERSONAL_LINE_NOT_OPEN = 8006;
+ RET_PERSONAL_LINE_PRE_QUEST_NOT_FINISH = 8007;
+ RET_HUNTING_ALREADY_FINISH_OFFER_LIMIT = 8201;
+ RET_HUNTING_HAS_UNFINISHED_OFFER = 8202;
+ RET_HUNTING_FAILED_OFFER_NOT_CD_READY = 8203;
+ RET_HUNTING_NOT_TAKE_OFFER = 8204;
+ RET_HUNTING_CANNOT_TAKE_TWICE = 8205;
+ RET_RPIVATE_CHAT_INVALID_CONTENT_TYPE = 8901;
+ RET_PRIVATE_CHAT_TARGET_IS_NOT_FRIEND = 8902;
+ RET_PRIVATE_CHAT_CONTENT_NOT_SUPPORTED = 8903;
+ RET_PRIVATE_CHAT_CONTENT_TOO_LONG = 8904;
+ RET_PRIVATE_CHAT_PULL_TOO_FAST = 8905;
+ RET_PRIVATE_CHAT_REPEAT_READ = 8906;
+ RET_PRIVATE_CHAT_READ_NOT_FRIEND = 8907;
+ RET_REUNION_FINISHED = 9001;
+ RET_REUNION_NOT_ACTIVATED = 9002;
+ RET_REUNION_ALREADY_TAKE_FIRST_REWARD = 9003;
+ RET_REUNION_SIGN_IN_REWARDED = 9004;
+ RET_REUNION_WATCHER_REWARDED = 9005;
+ RET_REUNION_WATCHER_NOT_FINISH = 9006;
+ RET_REUNION_MISSION_REWARDED = 9007;
+ RET_REUNION_MISSION_NOT_FINISH = 9008;
+ RET_REUNION_WATCHER_REWARD_NOT_UNLOCKED = 9009;
+ RET_BLESSING_CONTENT_CLOSED = 9101;
+ RET_BLESSING_NOT_ACTIVE = 9102;
+ RET_BLESSING_NOT_TODAY_ENTITY = 9103;
+ RET_BLESSING_ENTITY_EXCEED_SCAN_NUM_LIMIT = 9104;
+ RET_BLESSING_DAILY_SCAN_NUM_EXCEED_LIMIT = 9105;
+ RET_BLESSING_REDEEM_REWARD_NUM_EXCEED_LIMIT = 9106;
+ RET_BLESSING_REDEEM_PIC_NUM_NOT_ENOUGH = 9107;
+ RET_BLESSING_PIC_NOT_ENOUGH = 9108;
+ RET_BLESSING_PIC_HAS_RECEIVED = 9109;
+ RET_BLESSING_TARGET_RECV_NUM_EXCEED = 9110;
+ RET_FLEUR_FAIR_CREDIT_EXCEED_LIMIT = 9111;
+ RET_FLEUR_FAIR_CREDIT_NOT_ENOUGH = 9112;
+ RET_FLEUR_FAIR_TOKEN_EXCEED_LIMIT = 9113;
+ RET_FLEUR_FAIR_TOKEN_NOT_ENOUGH = 9114;
+ RET_FLEUR_FAIR_MINIGAME_NOT_OPEN = 9115;
+ RET_FLEUR_FAIR_MUSIC_GAME_DIFFICULTY_NOT_UNLOCK = 9116;
+ RET_FLEUR_FAIR_DUNGEON_LOCKED = 9117;
+ RET_FLEUR_FAIR_DUNGEON_PUNISH_TIME = 9118;
+ RET_FLEUR_FAIR_ONLY_OWNER_CAN_RESTART_MINIGAM = 9119;
+ RET_WATER_SPIRIT_COIN_EXCEED_LIMIT = 9120;
+ RET_WATER_SPIRIT_COIN_NOT_ENOUGH = 9121;
+ RET_REGION_SEARCH_NO_SEARCH = 9122;
+ RET_REGION_SEARCH_STATE_ERROR = 9123;
+ RET_CHANNELLER_SLAB_LOOP_DUNGEON_STAGE_NOT_OPEN = 9130;
+ RET_CHANNELLER_SLAB_LOOP_DUNGEON_NOT_OPEN = 9131;
+ RET_CHANNELLER_SLAB_LOOP_DUNGEON_FIRST_PASS_REWARD_HAS_TAKEN = 9132;
+ RET_CHANNELLER_SLAB_LOOP_DUNGEON_SCORE_REWARD_HAS_TAKEN = 9133;
+ RET_CHANNELLER_SLAB_INVALID_ONE_OFF_DUNGEON = 9134;
+ RET_CHANNELLER_SLAB_ONE_OFF_DUNGEON_DONE = 9135;
+ RET_CHANNELLER_SLAB_ONE_OFF_DUNGEON_STAGE_NOT_OPEN = 9136;
+ RET_CHANNELLER_SLAB_TOKEN_EXCEED_LIMIT = 9137;
+ RET_CHANNELLER_SLAB_TOKEN_NOT_ENOUGH = 9138;
+ RET_CHANNELLER_SLAB_PLAYER_NOT_IN_ONE_OFF_DUNGEON = 9139;
+ RET_MIST_TRIAL_SELECT_CHARACTER_NUM_NOT_ENOUGH = 9150;
+ RET_HIDE_AND_SEEK_PLAY_NOT_OPEN = 9160;
+ RET_HIDE_AND_SEEK_PLAY_MAP_NOT_OPEN = 9161;
+ RET_SUMMER_TIME_DRAFT_WOORD_EXCEED_LIMIT = 9170;
+ RET_SUMMER_TIME_DRAFT_WOORD_NOT_ENOUGH = 9171;
+ RET_SUMMER_TIME_MINI_HARPASTUM_EXCEED_LIMIT = 9172;
+ RET_SUMMER_TIME_MINI_HARPASTUMNOT_ENOUGH = 9173;
+ RET_BOUNCE_CONJURING_COIN_EXCEED_LIMIT = 9180;
+ RET_BOUNCE_CONJURING_COIN_NOT_ENOUGH = 9181;
+ RET_CHESS_TEACH_MAP_FINISHED = 9183;
+ RET_CHESS_TEACH_MAP_UNFINISHED = 9184;
+ RET_CHESS_COIN_EXCEED_LIMIT = 9185;
+ RET_CHESS_COIN_NOT_ENOUGH = 9186;
+ RET_CHESS_IN_PUNISH_TIME = 9187;
+ RET_CHESS_PREV_MAP_UNFINISHED = 9188;
+ RET_CHESS_MAP_LOCKED = 9189;
+ RET_BLITZ_RUSH_NOT_OPEN = 9192;
+ RET_BLITZ_RUSH_DUNGEON_NOT_OPEN = 9193;
+ RET_BLITZ_RUSH_COIN_A_EXCEED_LIMIT = 9194;
+ RET_BLITZ_RUSH_COIN_B_EXCEED_LIMIT = 9195;
+ RET_BLITZ_RUSH_COIN_A_NOT_ENOUGH = 9196;
+ RET_BLITZ_RUSH_COIN_B_NOT_ENOUGH = 9197;
+ RET_MIRACLE_RING_VALUE_NOT_ENOUGH = 9201;
+ RET_MIRACLE_RING_CD = 9202;
+ RET_MIRACLE_RING_REWARD_NOT_TAKEN = 9203;
+ RET_MIRACLE_RING_NOT_DELIVER = 9204;
+ RET_MIRACLE_RING_DELIVER_EXCEED = 9205;
+ RET_MIRACLE_RING_HAS_CREATED = 9206;
+ RET_MIRACLE_RING_HAS_NOT_CREATED = 9207;
+ RET_MIRACLE_RING_NOT_YOURS = 9208;
+ RET_GADGET_FOUNDATION_UNAUTHORIZED = 9251;
+ RET_GADGET_FOUNDATION_SCENE_NOT_FOUND = 9252;
+ RET_GADGET_FOUNDATION_NOT_IN_INIT_STATE = 9253;
+ RET_GADGET_FOUNDATION_BILDING_POINT_NOT_ENOUGHT = 9254;
+ RET_GADGET_FOUNDATION_NOT_IN_BUILT_STATE = 9255;
+ RET_GADGET_FOUNDATION_OP_NOT_SUPPORTED = 9256;
+ RET_GADGET_FOUNDATION_REQ_PLAYER_NOT_IN_SCENE = 9257;
+ RET_GADGET_FOUNDATION_LOCKED_BY_ANOTHER_PLAYER = 9258;
+ RET_GADGET_FOUNDATION_NOT_LOCKED = 9259;
+ RET_GADGET_FOUNDATION_DUPLICATE_LOCK = 9260;
+ RET_GADGET_FOUNDATION_PLAYER_NOT_FOUND = 9261;
+ RET_GADGET_FOUNDATION_PLAYER_GEAR_NOT_FOUND = 9262;
+ RET_GADGET_FOUNDATION_ROTAION_DISABLED = 9263;
+ RET_GADGET_FOUNDATION_REACH_DUNGEON_GEAR_LIMIT = 9264;
+ RET_GADGET_FOUNDATION_REACH_SINGLE_GEAR_LIMIT = 9265;
+ RET_GADGET_FOUNDATION_ROTATION_ON_GOING = 9266;
+ RET_OP_ACTIVITY_BONUS_NOT_FOUND = 9301;
+ RET_OP_ACTIVITY_NOT_OPEN = 9302;
+ RET_MULTISTAGE_PLAY_PLAYER_NOT_IN_SCENE = 9501;
+ RET_MULTISTAGE_PLAY_NOT_FOUND = 9502;
+ RET_COOP_CHAPTER_NOT_OPEN = 9601;
+ RET_COOP_COND_NOT_MEET = 9602;
+ RET_COOP_POINT_LOCKED = 9603;
+ RET_COOP_NOT_HAVE_PROGRESS = 9604;
+ RET_COOP_REWARD_HAS_TAKEN = 9605;
+ RET_DRAFT_HAS_ACTIVE_DRAFT = 9651;
+ RET_DRAFT_NOT_IN_MY_WORLD = 9652;
+ RET_DRAFT_NOT_SUPPORT_MP = 9653;
+ RET_DRAFT_PLAYER_NOT_ENOUGH = 9654;
+ RET_DRAFT_INCORRECT_SCENE = 9655;
+ RET_DRAFT_OTHER_PLAYER_ENTERING = 9656;
+ RET_DRAFT_GUEST_IS_TRANSFERRING = 9657;
+ RET_DRAFT_GUEST_NOT_IN_DRAFT_SCENE = 9658;
+ RET_DRAFT_INVITE_OVER_TIME = 9659;
+ RET_DRAFT_TWICE_CONFIRM_OVER_TIMER = 9660;
+ RET_HOME_UNKOWN = 9701;
+ RET_HOME_INVALID_CLIENT_PARAM = 9702;
+ RET_HOME_TARGE_PLAYER_HAS_NO_HOME = 9703;
+ RET_HOME_NOT_ONLINE = 9704;
+ RET_HOME_PLAYER_FULL = 9705;
+ RET_HOME_BLOCKED = 9706;
+ RET_HOME_ALREADY_IN_TARGET_HOME_WORLD = 9707;
+ RET_HOME_IN_EDIT_MODE = 9708;
+ RET_HOME_NOT_IN_EDIT_MODE = 9709;
+ RET_HOME_HAS_GUEST = 9710;
+ RET_HOME_CANT_ENTER_BY_IN_EDIT_MODE = 9711;
+ RET_HOME_CLIENT_PARAM_INVALID = 9712;
+ RET_HOME_PLAYER_NOT_IN_HOME_WORLD = 9713;
+ RET_HOME_PLAYER_NOT_IN_SELF_HOME_WORLD = 9714;
+ RET_HOME_NOT_FOUND_IN_MEM = 9715;
+ RET_HOME_PLAYER_IN_HOME_ROOM_SCENE = 9716;
+ RET_HOME_HOME_REFUSE_GUEST_ENTER = 9717;
+ RET_HOME_OWNER_REFUSE_TO_ENTER_HOME = 9718;
+ RET_HOME_OWNER_OFFLINE = 9719;
+ RET_HOME_FURNITURE_EXCEED_LIMIT = 9720;
+ RET_HOME_FURNITURE_COUNT_NOT_ENOUGH = 9721;
+ RET_HOME_IN_TRY_ENTER_PROCESS = 9722;
+ RET_HOME_ALREADY_IN_TARGET_SCENE = 9723;
+ RET_HOME_COIN_EXCEED_LIMIT = 9724;
+ RET_HOME_COIN_NOT_ENOUGH = 9725;
+ RET_HOME_MODULE_NOT_UNLOCKED = 9726;
+ RET_HOME_CUR_MODULE_CLOSED = 9727;
+ RET_HOME_FURNITURE_SUITE_NOT_UNLOCKED = 9728;
+ RET_HOME_IN_MATCH = 9729;
+ RET_HOME_IN_COMBAT = 9730;
+ RET_HOME_EDIT_MODE_CD = 9731;
+ RET_HOME_UPDATE_FURNITURE_CD = 9732;
+ RET_HOME_BLOCK_FURNITURE_LIMIT = 9733;
+ RET_HOME_NOT_SUPPORT = 9734;
+ RET_HOME_STATE_NOT_OPEN = 9735;
+ RET_HOME_TARGET_STATE_NOT_OPEN = 9736;
+ RET_HOME_APPLY_ENTER_OTHER_HOME_FAIL = 9737;
+ RET_HOME_SAVE_NO_MAIN_HOUSE = 9738;
+ RET_HOME_IN_DUNGEON = 9739;
+ RET_HOME_ANY_GALLERY_STARTED = 9740;
+ RET_HOME_QUEST_BLOCK_HOME = 9741;
+ RET_HOME_WAITING_PRIOR_CHECK = 9742;
+ RET_HOME_PERSISTENT_CHECK_FAIL = 9743;
+ RET_HOME_FIND_ONLINE_HOME_FAIL = 9744;
+ RET_HOME_JOIN_SCENE_FAIL = 9745;
+ RET_HOME_MAX_PLAYER = 9746;
+ RET_HOME_IN_TRANSFER = 9747;
+ RET_FURNITURE_MAKE_INDEX_ERROR = 9750;
+ RET_FURNITURE_MAKE_LOCKED = 9751;
+ RET_FURNITURE_MAKE_CONFIG_ERROR = 9752;
+ RET_FURNITURE_MAKE_SLOT_FULL = 9753;
+ RET_FURNITURE_MAKE_ADD_FURNITURE_FAIL = 9754;
+ RET_FURNITURE_MAKE_UNFINISH = 9755;
+ RET_FURNITURE_MAKE_IS_FINISH = 9756;
+ RET_FURNITURE_MAKE_NOT_IN_CORRECT_HOME = 9757;
+ RET_FURNITURE_MAKE_NO_COUNT = 9758;
+ RET_FURNITURE_MAKE_ACCELERATE_LIMIT = 9759;
+ RET_FURNITURE_MAKE_NO_MAKE_DATA = 9760;
+ RET_HOME_LIMITED_SHOP_CLOSE = 9761;
+ RET_HOME_AVATAR_NOT_SHOW = 9762;
+ RET_HOME_EVENT_COND_NOT_SATISFIED = 9763;
+ RET_HOME_INVALID_ARRANGE_ANIMAL_PARAM = 9764;
+ RET_HOME_INVALID_ARRANGE_NPC_PARAM = 9765;
+ RET_HOME_INVALID_ARRANGE_SUITE_PARAM = 9766;
+ RET_HOME_INVALID_ARRANGE_MAIN_HOUSE_PARAM = 9767;
+ RET_HOME_AVATAR_STATE_NOT_OPEN = 9768;
+ RET_HOME_PLANT_FIELD_NOT_EMPTY = 9769;
+ RET_HOME_PLANT_FIELD_EMPTY = 9770;
+ RET_HOME_PLANT_FIELD_TYPE_ERROR = 9771;
+ RET_HOME_PLANT_TIME_NOT_ENOUGH = 9772;
+ RET_HOME_PLANT_SUB_FIELD_NUM_NOT_ENOUGH = 9773;
+ RET_HOME_PLANT_FIELD_PARAM_ERROR = 9774;
+ RET_HOME_FURNITURE_GUID_ERROR = 9775;
+ RET_HOME_FURNITURE_ARRANGE_LIMIT = 9776;
+ RET_HOME_FISH_FARMING_LIMIT = 9777;
+ RET_HOME_FISH_COUNT_NOT_ENOUGH = 9778;
+ RET_HOME_FURNITURE_COST_LIMIT = 9779;
+ RET_HOME_CUSTOM_FURNITURE_INVALID = 9780;
+ RET_SUMO_ACTIVITY_STAGE_NOT_OPEN = 10000;
+ RET_SUMO_ACTIVITY_SWITCH_TEAM_IN_CD = 10001;
+ RET_SUMO_ACTIVITY_TEAM_NUM_INCORRECT = 10002;
+ RET_LUNA_RITE_ACTIVITY_AREA_ID_ERROR = 10004;
+ RET_LUNA_RITE_ACTIVITY_BATTLE_NOT_FINISH = 10005;
+ RET_LUNA_RITE_ACTIVITY_ALREADY_SACRIFICE = 10006;
+ RET_LUNA_RITE_ACTIVITY_ALREADY_TAKE_REWARD = 10007;
+ RET_LUNA_RITE_ACTIVITY_SACRIFICE_NOT_ENOUGH = 10008;
+ RET_LUNA_RITE_ACTIVITY_SEARCHING_COND_NOT_MEET = 10009;
+ RET_DIG_GADGET_CONFIG_ID_NOT_MATCH = 10015;
+ RET_DIG_FIND_NEAREST_POS_FAIL = 10016;
+ RET_MUSIC_GAME_LEVEL_NOT_OPEN = 10021;
+ RET_MUSIC_GAME_LEVEL_NOT_UNLOCK = 10022;
+ RET_MUSIC_GAME_LEVEL_NOT_STARTED = 10023;
+ RET_MUSIC_GAME_LEVEL_CONFIG_NOT_FOUND = 10024;
+ RET_MUSIC_GAME_LEVEL_ID_NOT_MATCH = 10025;
+ RET_ROGUELIKE_COIN_A_NOT_ENOUGH = 10031;
+ RET_ROGUELIKE_COIN_B_NOT_ENOUGH = 10032;
+ RET_ROGUELIKE_COIN_C_NOT_ENOUGH = 10033;
+ RET_ROGUELIKE_COIN_A_EXCEED_LIMIT = 10034;
+ RET_ROGUELIKE_COIN_B_EXCEED_LIMIT = 10035;
+ RET_ROGUELIKE_COIN_C_EXCEED_LIMIT = 10036;
+ RET_ROGUELIKE_RUNE_COUNT_NOT_ENOUGH = 10037;
+ RET_ROGUELIKE_NOT_IN_ROGUE_DUNGEON = 10038;
+ RET_ROGUELIKE_CELL_NOT_FOUND = 10039;
+ RET_ROGUELIKE_CELL_TYPE_INCORRECT = 10040;
+ RET_ROGUELIKE_CELL_ALREADY_FINISHED = 10041;
+ RET_ROGUELIKE_DUNGEON_HAVE_UNFINISHED_PROGRESS = 10042;
+ RET_ROGUELIKE_STAGE_NOT_FINISHED = 10043;
+ RET_ROGUELIKE_STAGE_FIRST_PASS_REWARD_HAS_TAKEN = 10045;
+ RET_ROGUELIKE_ACTIVITY_CONTENT_CLOSED = 10046;
+ RET_ROGUELIKE_DUNGEON_PRE_QUEST_NOT_FINISHED = 10047;
+ RET_ROGUELIKE_DUNGEON_NOT_OPEN = 10048;
+ RET_ROGUELIKE_SPRINT_IS_BANNED = 10049;
+ RET_ROGUELIKE_DUNGEON_PRE_STAGE_NOT_FINISHED = 10050;
+ RET_ROGUELIKE_ALL_AVATAR_DIE_CANNOT_RESUME = 10051;
+ RET_PLANT_FLOWER_ALREADY_TAKE_SEED = 10056;
+ RET_PLANT_FLOWER_FRIEND_HAVE_FLOWER_LIMIT = 10057;
+ RET_PLANT_FLOWER_CAN_GIVE_FLOWER_NOT_ENOUGH = 10058;
+ RET_PLANT_FLOWER_WISH_FLOWER_KINDS_LIMIT = 10059;
+ RET_PLANT_FLOWER_HAVE_FLOWER_NOT_ENOUGH = 10060;
+ RET_PLANT_FLOWER_FLOWER_COMBINATION_INVALID = 10061;
+ RET_NOT_IN_FISHING = 11001;
+ RET_FISH_STATE_ERROR = 11002;
+ RET_FISH_BAIT_LIMIT = 11003;
+ RET_FISHING_MAX_DISTANCE = 11004;
+ RET_FISHING_IN_COMBAT = 11005;
+ RET_FISHING_BATTLE_TOO_SHORT = 11006;
+ RET_FISH_GONE_AWAY = 11007;
+ RET_FAIL = -1;
+}
diff --git a/proto/RoguelikeGadgetInfo.proto b/proto/RoguelikeGadgetInfo.proto
new file mode 100644
index 0000000..763a019
--- /dev/null
+++ b/proto/RoguelikeGadgetInfo.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message RoguelikeGadgetInfo {
+ uint32 cell_config_id = 1;
+ uint32 cell_type = 2;
+ uint32 cell_state = 3;
+ uint32 cell_id = 4;
+}
diff --git a/proto/Route.proto b/proto/Route.proto
old mode 100644
new mode 100755
index 3394a99..b160925
--- a/proto/Route.proto
+++ b/proto/Route.proto
@@ -5,6 +5,6 @@ option java_package = "emu.grasscutter.net.proto";
import "RoutePoint.proto";
message Route {
- repeated RoutePoint routePoints = 1;
- uint32 routeType = 2;
+ repeated RoutePoint route_points = 1;
+ uint32 route_type = 2;
}
diff --git a/proto/RoutePoint.proto b/proto/RoutePoint.proto
old mode 100644
new mode 100755
index f4cb198..d6266de
--- a/proto/RoutePoint.proto
+++ b/proto/RoutePoint.proto
@@ -2,18 +2,19 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "MathQuaternion.proto";
import "Vector.proto";
+import "MathQuaternion.proto";
message RoutePoint {
- Vector position = 1;
- oneof moveParams {
+ oneof MoveParams {
float velocity = 11;
float time = 12;
}
- oneof rotateParams {
+ oneof RotateParams {
Vector rotation = 21;
- MathQuaternion rotationSpeed = 22;
- MathQuaternion axisSpeed = 23;
+ MathQuaternion rotation_speed = 22;
+ MathQuaternion axis_speed = 23;
}
+ Vector position = 1;
+ float arrive_range = 2;
}
diff --git a/proto/SceneAreaWeatherNotify.proto b/proto/SceneAreaWeatherNotify.proto
old mode 100644
new mode 100755
index 4d26db6..51b1681
--- a/proto/SceneAreaWeatherNotify.proto
+++ b/proto/SceneAreaWeatherNotify.proto
@@ -2,10 +2,19 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SceneAreaWeatherNotify {
- uint32 weatherGadgetId = 1;
- map weatherValueMap = 2;
- uint32 weatherAreaId = 3;
- uint32 climateType = 4;
- float transDuration = 5;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 251;
+ }
+
+ uint32 weather_gadget_id = 1;
+ map weather_value_map = 2;
+ uint32 weather_area_id = 3;
+ uint32 climate_type = 4;
+ float trans_duration = 5;
}
diff --git a/proto/SceneAvatarInfo.proto b/proto/SceneAvatarInfo.proto
old mode 100644
new mode 100755
index 5ce71c9..f6b23cf
--- a/proto/SceneAvatarInfo.proto
+++ b/proto/SceneAvatarInfo.proto
@@ -2,27 +2,32 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "SceneReliquaryInfo.proto";
import "SceneWeaponInfo.proto";
+import "CurVehicleInfo.proto";
+import "AvatarExcelInfo.proto";
+import "SceneReliquaryInfo.proto";
import "ServerBuff.proto";
message SceneAvatarInfo {
- uint32 playerId = 1;
- uint32 avatarId = 2;
+ uint32 uid = 1;
+ uint32 avatar_id = 2;
uint64 guid = 3;
- uint32 peerId = 4;
- repeated uint32 equipIdList = 5;
- uint32 skillDepotId = 6;
- repeated uint32 talentIdList = 7;
+ uint32 peer_id = 4;
+ repeated uint32 equip_id_list = 5;
+ uint32 skill_depot_id = 6;
+ repeated uint32 talent_id_list = 7;
SceneWeaponInfo weapon = 8;
- repeated SceneReliquaryInfo reliquaryList = 9;
- uint32 coreProudSkillLevel = 11;
- repeated uint32 inherentProudSkillList = 12;
- map skillLevelMap = 13;
- map proudSkillExtraLevelMap = 14;
- repeated ServerBuff serverBuffList = 15;
- repeated uint32 teamResonanceList = 16;
- uint32 wearingFlycloakId = 17;
- uint32 bornTime = 18;
- uint32 costumeId = 19;
+ repeated SceneReliquaryInfo reliquary_list = 9;
+ uint32 core_proud_skill_level = 11;
+ repeated uint32 inherent_proud_skill_list = 12;
+ map skill_level_map = 13;
+ map proud_skill_extra_level_map = 14;
+ repeated ServerBuff server_buff_list = 15;
+ repeated uint32 team_resonance_list = 16;
+ uint32 wearing_flycloak_id = 17;
+ uint32 born_time = 18;
+ uint32 costume_id = 19;
+ CurVehicleInfo cur_vehicle_info = 20;
+ AvatarExcelInfo excel_info = 21;
+ uint32 anim_hash = 22;
}
diff --git a/proto/SceneEntityAiInfo.proto b/proto/SceneEntityAiInfo.proto
old mode 100644
new mode 100755
index b4754bd..bc85ef4
--- a/proto/SceneEntityAiInfo.proto
+++ b/proto/SceneEntityAiInfo.proto
@@ -2,15 +2,15 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "ServantInfo.proto";
import "Vector.proto";
+import "ServantInfo.proto";
message SceneEntityAiInfo {
- bool isAiOpen = 1;
- Vector bornPos = 2;
- map skillCdMap = 3;
- ServantInfo servantInfo = 4;
- map aiThreatMap = 5;
- map skillGroupCdMap = 6;
- uint32 curTactic = 7;
+ bool is_ai_open = 1;
+ Vector born_pos = 2;
+ map skill_cd_map = 3;
+ ServantInfo servant_info = 4;
+ map ai_threat_map = 5;
+ map skill_group_cd_map = 6;
+ uint32 cur_tactic = 7;
}
diff --git a/proto/SceneEntityAppearNotify.proto b/proto/SceneEntityAppearNotify.proto
old mode 100644
new mode 100755
index 0694f16..388c69d
--- a/proto/SceneEntityAppearNotify.proto
+++ b/proto/SceneEntityAppearNotify.proto
@@ -2,11 +2,19 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "SceneEntityInfo.proto";
import "VisionType.proto";
+import "SceneEntityInfo.proto";
message SceneEntityAppearNotify {
- repeated SceneEntityInfo entityList = 1;
- VisionType appearType = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 201;
+ }
+
+ repeated SceneEntityInfo entity_list = 1;
+ VisionType appear_type = 2;
uint32 param = 3;
}
diff --git a/proto/SceneEntityDisappearNotify.proto b/proto/SceneEntityDisappearNotify.proto
old mode 100644
new mode 100755
index 02871b5..45a4c02
--- a/proto/SceneEntityDisappearNotify.proto
+++ b/proto/SceneEntityDisappearNotify.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "VisionType.proto";
message SceneEntityDisappearNotify {
- repeated uint32 entityList = 1;
- VisionType disappearType = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 294;
+ }
+
+ repeated uint32 entity_list = 1;
+ VisionType disappear_type = 2;
}
diff --git a/proto/SceneEntityDrownReq.proto b/proto/SceneEntityDrownReq.proto
index 55b439a..a0a98e9 100644
--- a/proto/SceneEntityDrownReq.proto
+++ b/proto/SceneEntityDrownReq.proto
@@ -1,6 +1,16 @@
syntax = "proto3";
+
option java_package = "emu.grasscutter.net.proto";
message SceneEntityDrownReq {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 222;
+ }
+
uint32 entity_id = 1;
}
diff --git a/proto/SceneEntityDrownRsp.proto b/proto/SceneEntityDrownRsp.proto
index 1b33213..8db1aec 100644
--- a/proto/SceneEntityDrownRsp.proto
+++ b/proto/SceneEntityDrownRsp.proto
@@ -1,7 +1,16 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SceneEntityDrownRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 276;
+ }
+
int32 retcode = 1;
uint32 entity_id = 2;
}
diff --git a/proto/SceneEntityInfo.proto b/proto/SceneEntityInfo.proto
old mode 100644
new mode 100755
index d79fe4f..0c56b70
--- a/proto/SceneEntityInfo.proto
+++ b/proto/SceneEntityInfo.proto
@@ -2,38 +2,40 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "AnimatorParameterValueInfoPair.proto";
-import "EntityAuthorityInfo.proto";
-import "EntityClientData.proto";
-import "EntityEnvironmentInfo.proto";
-import "FightPropPair.proto";
-import "MotionInfo.proto";
-import "PropPair.proto";
-import "ProtEntityType.proto";
import "SceneAvatarInfo.proto";
-import "SceneGadgetInfo.proto";
import "SceneMonsterInfo.proto";
import "SceneNpcInfo.proto";
+import "SceneGadgetInfo.proto";
+import "ProtEntityType.proto";
+import "MotionInfo.proto";
+import "EntityClientData.proto";
+import "EntityAuthorityInfo.proto";
+import "PropPair.proto";
+import "FightPropPair.proto";
+import "AnimatorParameterValueInfoPair.proto";
+import "EntityEnvironmentInfo.proto";
+import "ServerBuff.proto";
message SceneEntityInfo {
- ProtEntityType entityType = 1;
- uint32 entityId = 2;
- string name = 3;
- MotionInfo motionInfo = 4;
- repeated PropPair propList = 5;
- repeated FightPropPair fightPropList = 6;
- uint32 lifeState = 7;
- repeated AnimatorParameterValueInfoPair animatorParaList = 9;
- oneof entity {
+ oneof Entity {
SceneAvatarInfo avatar = 10;
SceneMonsterInfo monster = 11;
SceneNpcInfo npc = 12;
SceneGadgetInfo gadget = 13;
}
- uint32 lastMoveSceneTimeMs = 17;
- uint32 lastMoveReliableSeq = 18;
- EntityClientData entityClientData = 19;
- repeated EntityEnvironmentInfo entityEnvironmentInfoList = 20;
- EntityAuthorityInfo entityAuthorityInfo = 21;
- repeated string tagList = 22;
+ ProtEntityType entity_type = 1;
+ uint32 entity_id = 2;
+ string name = 3;
+ MotionInfo motion_info = 4;
+ repeated PropPair prop_list = 5;
+ repeated FightPropPair fight_prop_list = 6;
+ uint32 life_state = 7;
+ repeated AnimatorParameterValueInfoPair animator_para_list = 9;
+ uint32 last_move_scene_time_ms = 17;
+ uint32 last_move_reliable_seq = 18;
+ EntityClientData entity_client_data = 19;
+ repeated EntityEnvironmentInfo entity_environment_info_list = 20;
+ EntityAuthorityInfo entity_authority_info = 21;
+ repeated string tag_list = 22;
+ repeated ServerBuff server_buff_list = 23;
}
diff --git a/proto/SceneEntityMoveNotify.proto b/proto/SceneEntityMoveNotify.proto
old mode 100644
new mode 100755
index 8e5016d..58b430c
--- a/proto/SceneEntityMoveNotify.proto
+++ b/proto/SceneEntityMoveNotify.proto
@@ -5,8 +5,16 @@ option java_package = "emu.grasscutter.net.proto";
import "MotionInfo.proto";
message SceneEntityMoveNotify {
- uint32 entityId = 1;
- MotionInfo motionInfo = 2;
- uint32 sceneTime = 3;
- uint32 reliableSeq = 4;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ ENET_CHANNEL_ID = 1;
+ CMD_ID = 226;
+ }
+
+ uint32 entity_id = 1;
+ MotionInfo motion_info = 2;
+ uint32 scene_time = 3;
+ uint32 reliable_seq = 4;
}
diff --git a/proto/SceneFishInfo.proto b/proto/SceneFishInfo.proto
new file mode 100644
index 0000000..212a244
--- /dev/null
+++ b/proto/SceneFishInfo.proto
@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "Vector.proto";
+
+message SceneFishInfo {
+ uint32 fish_id = 1;
+ uint32 fish_pool_entity_id = 2;
+ Vector fish_pool_pos = 3;
+ uint32 fish_pool_gadget_id = 4;
+}
diff --git a/proto/SceneForceUnlockNotify.proto b/proto/SceneForceUnlockNotify.proto
old mode 100644
new mode 100755
index c78e2dd..b260606
--- a/proto/SceneForceUnlockNotify.proto
+++ b/proto/SceneForceUnlockNotify.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SceneForceUnlockNotify {
- repeated uint32 forceIdList = 1;
- bool isAdd = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 292;
+ }
+
+ repeated uint32 force_id_list = 1;
+ bool is_add = 2;
}
diff --git a/proto/SceneGadgetInfo.proto b/proto/SceneGadgetInfo.proto
old mode 100644
new mode 100755
index b4430fa..0c405e4
--- a/proto/SceneGadgetInfo.proto
+++ b/proto/SceneGadgetInfo.proto
@@ -2,42 +2,67 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "GadgetBornType.proto";
-import "GadgetClientParam.proto";
-import "GadgetPlayInfo.proto";
import "Item.proto";
+import "GatherGadgetInfo.proto";
+import "WorktopInfo.proto";
+import "ClientGadgetInfo.proto";
+import "WeatherInfo.proto";
+import "AbilityGadgetInfo.proto";
+import "StatueGadgetInfo.proto";
+import "BossChestInfo.proto";
+import "BlossomChestInfo.proto";
+import "MpPlayRewardInfo.proto";
+import "GadgetGeneralRewardInfo.proto";
+import "OfferingInfo.proto";
+import "FoundationInfo.proto";
+import "VehicleInfo.proto";
+import "EchoShellInfo.proto";
+import "ScreenInfo.proto";
+import "FishPoolInfo.proto";
+import "CustomGadgetTreeInfo.proto";
+import "RoguelikeGadgetInfo.proto";
+import "GadgetBornType.proto";
import "PlatformInfo.proto";
+import "GadgetPlayInfo.proto";
message SceneGadgetInfo {
- uint32 gadgetId = 1;
- uint32 groupId = 2;
- uint32 configId = 3;
- uint32 ownerEntityId = 4;
- GadgetBornType bornType = 5;
- uint32 gadgetState = 6;
- uint32 gadgetType = 7;
- bool isShowCutscene = 8;
- uint32 authorityPeerId = 9;
- bool isEnableInteract = 10;
- uint32 interactId = 11;
- Item trifleItem = 12;
- uint32 gatherGadget = 13;
- uint32 worktop = 14;
- GadgetClientParam clientGadget = 15;
- uint32 weather = 17;
- uint32 abilityGadget = 18;
- uint32 statueGadget = 19;
- uint32 bossChest = 20;
- uint32 blossomChest = 41;
- uint32 mpPlayReward = 42;
- uint32 generalReward = 43;
- uint32 offeringInfo = 44;
- uint32 foundationInfo = 45;
- uint32 markFlag = 21;
- uint32 propOwnerEntityId = 22;
+ oneof Content {
+ Item trifle_item = 12;
+ GatherGadgetInfo gather_gadget = 13;
+ WorktopInfo worktop = 14;
+ ClientGadgetInfo client_gadget = 15;
+ WeatherInfo weather = 17;
+ AbilityGadgetInfo ability_gadget = 18;
+ StatueGadgetInfo statue_gadget = 19;
+ BossChestInfo boss_chest = 20;
+ BlossomChestInfo blossom_chest = 41;
+ MpPlayRewardInfo mp_play_reward = 42;
+ GadgetGeneralRewardInfo general_reward = 43;
+ OfferingInfo offering_info = 44;
+ FoundationInfo foundation_info = 45;
+ VehicleInfo vehicle_info = 46;
+ EchoShellInfo shell_info = 47;
+ ScreenInfo screen_info = 48;
+ FishPoolInfo fish_pool_info = 59;
+ CustomGadgetTreeInfo custom_gadget_tree_info = 60;
+ RoguelikeGadgetInfo roguelike_gadget_info = 61;
+ }
+ uint32 gadget_id = 1;
+ uint32 group_id = 2;
+ uint32 config_id = 3;
+ uint32 owner_entity_id = 4;
+ GadgetBornType born_type = 5;
+ uint32 gadget_state = 6;
+ uint32 gadget_type = 7;
+ bool is_show_cutscene = 8;
+ uint32 authority_peer_id = 9;
+ bool is_enable_interact = 10;
+ uint32 interact_id = 11;
+ uint32 mark_flag = 21;
+ uint32 prop_owner_entity_id = 22;
PlatformInfo platform = 23;
- repeated uint32 interactUidList = 24;
- uint32 draftId = 25;
- uint32 gadgetTalkState = 26;
- GadgetPlayInfo playInfo = 100;
+ repeated uint32 interact_uid_list = 24;
+ uint32 draft_id = 25;
+ uint32 gadget_talk_state = 26;
+ GadgetPlayInfo play_info = 100;
}
diff --git a/proto/SceneInitFinishRsp.proto b/proto/SceneInitFinishRsp.proto
old mode 100644
new mode 100755
index 1dfc6a2..bdc518b
--- a/proto/SceneInitFinishRsp.proto
+++ b/proto/SceneInitFinishRsp.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SceneInitFinishRsp {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 300;
+ }
+
int32 retcode = 1;
- uint32 enterSceneToken = 2;
+ uint32 enter_scene_token = 2;
}
diff --git a/proto/SceneKickPlayerNotify.proto b/proto/SceneKickPlayerNotify.proto
old mode 100644
new mode 100755
index 6a400ae..cb8e5f0
--- a/proto/SceneKickPlayerNotify.proto
+++ b/proto/SceneKickPlayerNotify.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SceneKickPlayerNotify {
- uint32 kickerUid = 1;
- uint32 targetUid = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 235;
+ }
+
+ uint32 kicker_uid = 1;
+ uint32 target_uid = 2;
}
diff --git a/proto/SceneKickPlayerReq.proto b/proto/SceneKickPlayerReq.proto
old mode 100644
new mode 100755
index fe7e371..eada835
--- a/proto/SceneKickPlayerReq.proto
+++ b/proto/SceneKickPlayerReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SceneKickPlayerReq {
- uint32 targetUid = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 268;
+ }
+
+ uint32 target_uid = 1;
}
diff --git a/proto/SceneKickPlayerRsp.proto b/proto/SceneKickPlayerRsp.proto
old mode 100644
new mode 100755
index 8110089..68eadc2
--- a/proto/SceneKickPlayerRsp.proto
+++ b/proto/SceneKickPlayerRsp.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SceneKickPlayerRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 272;
+ }
+
int32 retcode = 1;
- uint32 targetUid = 2;
+ uint32 target_uid = 2;
}
diff --git a/proto/SceneMonsterInfo.proto b/proto/SceneMonsterInfo.proto
old mode 100644
new mode 100755
index f96c6c2..ef95728
--- a/proto/SceneMonsterInfo.proto
+++ b/proto/SceneMonsterInfo.proto
@@ -2,29 +2,34 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+import "SceneFishInfo.proto";
import "MonsterBornType.proto";
import "MonsterRoute.proto";
import "SceneWeaponInfo.proto";
message SceneMonsterInfo {
- uint32 monsterId = 1;
- uint32 groupId = 2;
- uint32 configId = 3;
- SceneWeaponInfo weaponList = 4;
- uint32 authorityPeerId = 5;
- repeated uint32 affixList = 6;
- bool isElite = 7;
- uint32 ownerEntityId = 8;
- uint32 summonedTag = 9;
- map summonTagMap = 10;
- uint32 poseId = 11;
- MonsterBornType bornType = 12;
- uint32 blockId = 13;
- uint32 markFlag = 14;
- uint32 titleId = 15;
- uint32 specialNameId = 16;
- uint32 attackTargetId = 17;
- MonsterRoute monsterRoute = 18;
- uint32 aiConfigId = 19;
- uint32 unk1 = 21;
+ oneof Content {
+ SceneFishInfo fish_info = 50;
+ }
+ uint32 monster_id = 1;
+ uint32 group_id = 2;
+ uint32 config_id = 3;
+ repeated SceneWeaponInfo weapon_list = 4;
+ uint32 authority_peer_id = 5;
+ repeated uint32 affix_list = 6;
+ bool is_elite = 7;
+ uint32 owner_entity_id = 8;
+ uint32 summoned_tag = 9;
+ map summon_tag_map = 10;
+ uint32 pose_id = 11;
+ MonsterBornType born_type = 12;
+ uint32 block_id = 13;
+ uint32 mark_flag = 14;
+ uint32 title_id = 15;
+ uint32 special_name_id = 16;
+ uint32 attack_target_id = 17;
+ MonsterRoute monster_route = 18;
+ uint32 ai_config_id = 19;
+ uint32 level_route_id = 20;
+ uint32 init_pose_id = 21;
}
diff --git a/proto/SceneNpcInfo.proto b/proto/SceneNpcInfo.proto
old mode 100644
new mode 100755
index 22e8118..b04265c
--- a/proto/SceneNpcInfo.proto
+++ b/proto/SceneNpcInfo.proto
@@ -2,9 +2,10 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SceneNpcInfo {
- uint32 npcId = 1;
- uint32 roomId = 2;
- uint32 parentQuestId = 3;
- uint32 blockId = 4;
+ uint32 npc_id = 1;
+ uint32 room_id = 2;
+ uint32 parent_quest_id = 3;
+ uint32 block_id = 4;
}
diff --git a/proto/ScenePlayerInfo.proto b/proto/ScenePlayerInfo.proto
old mode 100644
new mode 100755
index d1dae17..bcfb4f0
--- a/proto/ScenePlayerInfo.proto
+++ b/proto/ScenePlayerInfo.proto
@@ -6,9 +6,9 @@ import "OnlinePlayerInfo.proto";
message ScenePlayerInfo {
uint32 uid = 1;
- uint32 peerId = 2;
+ uint32 peer_id = 2;
string name = 3;
- bool isConnected = 4;
- uint32 sceneId = 5;
- OnlinePlayerInfo onlinePlayerInfo = 6;
+ bool is_connected = 4;
+ uint32 scene_id = 5;
+ OnlinePlayerInfo online_player_info = 6;
}
diff --git a/proto/ScenePlayerInfoNotify.proto b/proto/ScenePlayerInfoNotify.proto
old mode 100644
new mode 100755
index 2c10873..7f789f3
--- a/proto/ScenePlayerInfoNotify.proto
+++ b/proto/ScenePlayerInfoNotify.proto
@@ -5,5 +5,13 @@ option java_package = "emu.grasscutter.net.proto";
import "ScenePlayerInfo.proto";
message ScenePlayerInfoNotify {
- repeated ScenePlayerInfo playerInfoList = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 293;
+ }
+
+ repeated ScenePlayerInfo player_info_list = 1;
}
diff --git a/proto/ScenePlayerLocationNotify.proto b/proto/ScenePlayerLocationNotify.proto
old mode 100644
new mode 100755
index 6eccf37..6e84788
--- a/proto/ScenePlayerLocationNotify.proto
+++ b/proto/ScenePlayerLocationNotify.proto
@@ -3,8 +3,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "PlayerLocationInfo.proto";
+import "VehicleLocationInfo.proto";
message ScenePlayerLocationNotify {
- uint32 sceneId = 1;
- repeated PlayerLocationInfo playerLocList = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ ENET_CHANNEL_ID = 1;
+ CMD_ID = 224;
+ }
+
+ uint32 scene_id = 1;
+ repeated PlayerLocationInfo player_loc_list = 2;
+ repeated VehicleLocationInfo vehicle_loc_list = 3;
}
diff --git a/proto/SceneReliquaryInfo.proto b/proto/SceneReliquaryInfo.proto
old mode 100644
new mode 100755
index 122ca88..8d785d4
--- a/proto/SceneReliquaryInfo.proto
+++ b/proto/SceneReliquaryInfo.proto
@@ -2,9 +2,10 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SceneReliquaryInfo {
- uint32 itemId = 1;
+ uint32 item_id = 1;
uint64 guid = 2;
uint32 level = 3;
- uint32 promoteLevel = 4;
+ uint32 promote_level = 4;
}
diff --git a/proto/SceneTeamAvatar.proto b/proto/SceneTeamAvatar.proto
old mode 100644
new mode 100755
index 0b46839..1b09ddb
--- a/proto/SceneTeamAvatar.proto
+++ b/proto/SceneTeamAvatar.proto
@@ -2,28 +2,28 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "AbilityControlBlock.proto";
-import "AbilitySyncStateInfo.proto";
import "AvatarInfo.proto";
import "SceneAvatarInfo.proto";
+import "AbilitySyncStateInfo.proto";
import "SceneEntityInfo.proto";
+import "AbilityControlBlock.proto";
import "ServerBuff.proto";
message SceneTeamAvatar {
- uint32 playerId = 1;
- uint64 avatarGuid = 2;
- uint32 sceneId = 3;
- uint32 entityId = 4;
- AvatarInfo avatarInfo = 5;
- SceneAvatarInfo sceneAvatarInfo = 6;
- AbilitySyncStateInfo avatarAbilityInfo = 7;
- repeated ServerBuff serverBuffList = 8;
- SceneEntityInfo sceneEntityInfo = 9;
- uint64 weaponGuid = 10;
- uint32 weaponEntityId = 11;
- AbilitySyncStateInfo weaponAbilityInfo = 12;
- AbilityControlBlock abilityControlBlock = 13;
- bool isReconnect = 14;
- bool isPlayerCurAvatar = 15;
- bool isOnScene = 16;
+ uint32 player_uid = 1;
+ uint64 avatar_guid = 2;
+ uint32 scene_id = 3;
+ uint32 entity_id = 4;
+ AvatarInfo avatar_info = 5;
+ SceneAvatarInfo scene_avatar_info = 6;
+ AbilitySyncStateInfo avatar_ability_info = 7;
+ repeated ServerBuff server_buff_list = 8;
+ SceneEntityInfo scene_entity_info = 9;
+ uint64 weapon_guid = 10;
+ uint32 weapon_entity_id = 11;
+ AbilitySyncStateInfo weapon_ability_info = 12;
+ AbilityControlBlock ability_control_block = 13;
+ bool is_reconnect = 14;
+ bool is_player_cur_avatar = 15;
+ bool is_on_scene = 16;
}
diff --git a/proto/SceneTeamUpdateNotify.proto b/proto/SceneTeamUpdateNotify.proto
old mode 100644
new mode 100755
index 6aa586c..183d88f
--- a/proto/SceneTeamUpdateNotify.proto
+++ b/proto/SceneTeamUpdateNotify.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "SceneTeamAvatar.proto";
message SceneTeamUpdateNotify {
- repeated SceneTeamAvatar sceneTeamAvatarList = 1;
- bool isInMp = 3;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1793;
+ }
+
+ repeated SceneTeamAvatar scene_team_avatar_list = 1;
+ bool is_in_mp = 3;
}
diff --git a/proto/SceneTimeNotify.proto b/proto/SceneTimeNotify.proto
old mode 100644
new mode 100755
index cafe00a..601be27
--- a/proto/SceneTimeNotify.proto
+++ b/proto/SceneTimeNotify.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SceneTimeNotify {
- uint32 sceneId = 1;
- bool isPaused = 2;
- uint64 sceneTime = 3;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 230;
+ }
+
+ uint32 scene_id = 1;
+ bool is_paused = 2;
+ uint64 scene_time = 3;
}
diff --git a/proto/SceneTransToPointReq.proto b/proto/SceneTransToPointReq.proto
old mode 100644
new mode 100755
index 0eae549..aed746d
--- a/proto/SceneTransToPointReq.proto
+++ b/proto/SceneTransToPointReq.proto
@@ -1,17 +1,18 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-message SceneTransToPointReq {
- enum CmdId {
- option allow_alias = true;
- NONE = 0;
- ENET_CHANNEL_ID = 0;
- ENET_IS_RELIABLE = 1;
- IS_ALLOW_CLIENT = 1;
- CMD_ID = 219;
- }
-
- uint32 sceneId = 1;
- uint32 pointId = 2;
-}
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message SceneTransToPointReq {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 270;
+ }
+
+ uint32 scene_id = 1;
+ uint32 point_id = 2;
+}
diff --git a/proto/SceneTransToPointRsp.proto b/proto/SceneTransToPointRsp.proto
old mode 100644
new mode 100755
index 1182c69..3448f26
--- a/proto/SceneTransToPointRsp.proto
+++ b/proto/SceneTransToPointRsp.proto
@@ -1,17 +1,18 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-message SceneTransToPointRsp {
- enum CmdId {
- option allow_alias = true;
- NONE = 0;
- ENET_CHANNEL_ID = 0;
- ENET_IS_RELIABLE = 1;
- CMD_ID = 220;
- }
-
- int32 retcode = 1;
- uint32 sceneId = 2;
- uint32 pointId = 3;
-}
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message SceneTransToPointRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 232;
+ }
+
+ int32 retcode = 1;
+ uint32 scene_id = 2;
+ uint32 point_id = 3;
+}
diff --git a/proto/SceneUnlockInfo.proto b/proto/SceneUnlockInfo.proto
old mode 100644
new mode 100755
diff --git a/proto/SceneUnlockInfoNotify.proto b/proto/SceneUnlockInfoNotify.proto
old mode 100644
new mode 100755
diff --git a/proto/SceneWeaponInfo.proto b/proto/SceneWeaponInfo.proto
old mode 100644
new mode 100755
index 5b823b9..db45af8
--- a/proto/SceneWeaponInfo.proto
+++ b/proto/SceneWeaponInfo.proto
@@ -5,12 +5,12 @@ option java_package = "emu.grasscutter.net.proto";
import "AbilitySyncStateInfo.proto";
message SceneWeaponInfo {
- uint32 entityId = 1;
- uint32 gadgetId = 2;
- uint32 itemId = 3;
+ uint32 entity_id = 1;
+ uint32 gadget_id = 2;
+ uint32 item_id = 3;
uint64 guid = 4;
uint32 level = 5;
- uint32 promoteLevel = 6;
- AbilitySyncStateInfo abilityInfo = 7;
- map affixMap = 8;
+ uint32 promote_level = 6;
+ AbilitySyncStateInfo ability_info = 7;
+ map affix_map = 8;
}
diff --git a/proto/ScreenInfo.proto b/proto/ScreenInfo.proto
new file mode 100644
index 0000000..2fa3842
--- /dev/null
+++ b/proto/ScreenInfo.proto
@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message ScreenInfo {
+ uint32 live_id = 1;
+ uint32 projector_entity_id = 2;
+}
diff --git a/proto/ServantInfo.proto b/proto/ServantInfo.proto
old mode 100644
new mode 100755
index e4c04e3..3ed3e9b
--- a/proto/ServantInfo.proto
+++ b/proto/ServantInfo.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ServantInfo {
- uint32 masterEntityId = 1;
- uint32 bornSlotIndex = 2;
+ uint32 master_entity_id = 1;
+ uint32 born_slot_index = 2;
}
diff --git a/proto/ServerBuff.proto b/proto/ServerBuff.proto
old mode 100644
new mode 100755
index 0de4768..bc96958
--- a/proto/ServerBuff.proto
+++ b/proto/ServerBuff.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ServerBuff {
- uint32 serverBuffUid = 1;
- uint32 serverBuffId = 2;
- uint32 serverBuffType = 3;
- uint32 instancedModifierId = 4;
- repeated uint32 doneOnaddedActionList = 5;
- bool isOnaddedActionAllow = 6;
+ uint32 server_buff_uid = 1;
+ uint32 server_buff_id = 2;
+ uint32 server_buff_type = 3;
+ uint32 instanced_modifier_id = 4;
+ bool is_modifier_added = 5;
}
diff --git a/proto/ServerTimeNotify.proto b/proto/ServerTimeNotify.proto
old mode 100644
new mode 100755
index 9452ef8..f20266a
--- a/proto/ServerTimeNotify.proto
+++ b/proto/ServerTimeNotify.proto
@@ -2,6 +2,15 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ServerTimeNotify {
- uint64 serverTime = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ ENET_CHANNEL_ID = 1;
+ CMD_ID = 79;
+ }
+
+ uint64 server_time = 1;
}
diff --git a/proto/SetEntityClientDataNotify.proto b/proto/SetEntityClientDataNotify.proto
old mode 100644
new mode 100755
index 5d16ceb..2760a4d
--- a/proto/SetEntityClientDataNotify.proto
+++ b/proto/SetEntityClientDataNotify.proto
@@ -5,6 +5,15 @@ option java_package = "emu.grasscutter.net.proto";
import "EntityClientData.proto";
message SetEntityClientDataNotify {
- uint32 entityId = 1;
- EntityClientData entityClientData = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 3187;
+ }
+
+ uint32 entity_id = 1;
+ EntityClientData entity_client_data = 2;
}
diff --git a/proto/SetEquipLockStateReq.proto b/proto/SetEquipLockStateReq.proto
old mode 100644
new mode 100755
index 55f3f93..91c97d4
--- a/proto/SetEquipLockStateReq.proto
+++ b/proto/SetEquipLockStateReq.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SetEquipLockStateReq {
- uint64 targetEquipGuid = 1;
- bool isLocked = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 605;
+ }
+
+ uint64 target_equip_guid = 1;
+ bool is_locked = 2;
}
diff --git a/proto/SetEquipLockStateRsp.proto b/proto/SetEquipLockStateRsp.proto
old mode 100644
new mode 100755
index fe70b22..7afa750
--- a/proto/SetEquipLockStateRsp.proto
+++ b/proto/SetEquipLockStateRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SetEquipLockStateRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 662;
+ }
+
int32 retcode = 1;
- uint64 targetEquipGuid = 2;
- bool isLocked = 3;
+ uint64 target_equip_guid = 2;
+ bool is_locked = 3;
}
diff --git a/proto/SetNameCardReq.proto b/proto/SetNameCardReq.proto
old mode 100644
new mode 100755
index 4452d3b..d89eedb
--- a/proto/SetNameCardReq.proto
+++ b/proto/SetNameCardReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SetNameCardReq {
- uint32 nameCardId = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 4016;
+ }
+
+ uint32 name_card_id = 1;
}
diff --git a/proto/SetNameCardRsp.proto b/proto/SetNameCardRsp.proto
old mode 100644
new mode 100755
index 821c019..f45961a
--- a/proto/SetNameCardRsp.proto
+++ b/proto/SetNameCardRsp.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SetNameCardRsp {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 4096;
+ }
+
int32 retcode = 1;
- uint32 nameCardId = 2;
+ uint32 name_card_id = 2;
}
diff --git a/proto/SetPlayerBirthdayReq.proto b/proto/SetPlayerBirthdayReq.proto
deleted file mode 100644
index 74b0df9..0000000
--- a/proto/SetPlayerBirthdayReq.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-import "proto/Birthday.proto";
-
-message SetPlayerBirthdayReq {
- Birthday birth = 1;
-}
diff --git a/proto/SetPlayerBirthdayRsp.proto b/proto/SetPlayerBirthdayRsp.proto
deleted file mode 100644
index 5a830c0..0000000
--- a/proto/SetPlayerBirthdayRsp.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-import "proto/Birthday.proto";
-
-message SetPlayerBirthdayRsp {
- Birthday birth = 1;
-}
diff --git a/proto/SetPlayerBornDataReq.proto b/proto/SetPlayerBornDataReq.proto
old mode 100644
new mode 100755
index 56b6fd3..64f40cf
--- a/proto/SetPlayerBornDataReq.proto
+++ b/proto/SetPlayerBornDataReq.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SetPlayerBornDataReq {
- uint32 avatarId = 1;
- string nickName = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 119;
+ }
+
+ uint32 avatar_id = 1;
+ string nick_name = 2;
}
diff --git a/proto/SetPlayerHeadImageReq.proto b/proto/SetPlayerHeadImageReq.proto
old mode 100644
new mode 100755
index 90016ce..d2182ba
--- a/proto/SetPlayerHeadImageReq.proto
+++ b/proto/SetPlayerHeadImageReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SetPlayerHeadImageReq {
- uint32 avatarId = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 4014;
+ }
+
+ uint32 avatar_id = 1;
}
diff --git a/proto/SetPlayerHeadImageRsp.proto b/proto/SetPlayerHeadImageRsp.proto
old mode 100644
new mode 100755
index 6a2ea44..28d568c
--- a/proto/SetPlayerHeadImageRsp.proto
+++ b/proto/SetPlayerHeadImageRsp.proto
@@ -2,9 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "HeadImage.proto";
+import "ProfilePicture.proto";
message SetPlayerHeadImageRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 4015;
+ }
+
int32 retcode = 1;
- HeadImage avatar = 3;
+ uint32 avatar_id = 2;
+ ProfilePicture profile_picture = 3;
}
diff --git a/proto/SetPlayerNameReq.proto b/proto/SetPlayerNameReq.proto
old mode 100644
new mode 100755
index 558eb0f..d9b6062
--- a/proto/SetPlayerNameReq.proto
+++ b/proto/SetPlayerNameReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SetPlayerNameReq {
- string nickName = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 132;
+ }
+
+ string nick_name = 1;
}
diff --git a/proto/SetPlayerNameRsp.proto b/proto/SetPlayerNameRsp.proto
old mode 100644
new mode 100755
index b4b02e6..0e4be09
--- a/proto/SetPlayerNameRsp.proto
+++ b/proto/SetPlayerNameRsp.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SetPlayerNameRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 147;
+ }
+
int32 retcode = 1;
- string nickName = 2;
+ string nick_name = 2;
}
diff --git a/proto/SetPlayerPropReq.proto b/proto/SetPlayerPropReq.proto
old mode 100644
new mode 100755
index d08c2a5..41b018e
--- a/proto/SetPlayerPropReq.proto
+++ b/proto/SetPlayerPropReq.proto
@@ -5,5 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "PropValue.proto";
message SetPlayerPropReq {
- repeated PropValue propList = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 191;
+ }
+
+ repeated PropValue prop_list = 1;
}
diff --git a/proto/SetPlayerPropRsp.proto b/proto/SetPlayerPropRsp.proto
old mode 100644
new mode 100755
index 62d231e..935754f
--- a/proto/SetPlayerPropRsp.proto
+++ b/proto/SetPlayerPropRsp.proto
@@ -2,6 +2,15 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SetPlayerPropRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 136;
+ }
+
int32 retcode = 1;
}
diff --git a/proto/SetPlayerSignatureReq.proto b/proto/SetPlayerSignatureReq.proto
old mode 100644
new mode 100755
index 595345b..dd1f5e8
--- a/proto/SetPlayerSignatureReq.proto
+++ b/proto/SetPlayerSignatureReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SetPlayerSignatureReq {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 4036;
+ }
+
string signature = 1;
}
diff --git a/proto/SetPlayerSignatureRsp.proto b/proto/SetPlayerSignatureRsp.proto
old mode 100644
new mode 100755
index ca09cd1..b225cec
--- a/proto/SetPlayerSignatureRsp.proto
+++ b/proto/SetPlayerSignatureRsp.proto
@@ -2,7 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SetPlayerSignatureRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 4019;
+ }
+
int32 retcode = 1;
string signature = 2;
}
diff --git a/proto/SetUpAvatarTeamReq.proto b/proto/SetUpAvatarTeamReq.proto
old mode 100644
new mode 100755
index b950cb2..3c2db15
--- a/proto/SetUpAvatarTeamReq.proto
+++ b/proto/SetUpAvatarTeamReq.proto
@@ -2,8 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SetUpAvatarTeamReq {
- uint32 teamId = 1;
- repeated uint64 avatarTeamGuidList = 2;
- uint64 curAvatarGuid = 3;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1653;
+ }
+
+ uint32 team_id = 1;
+ repeated uint64 avatar_team_guid_list = 2;
+ uint64 cur_avatar_guid = 3;
}
diff --git a/proto/SetUpAvatarTeamRsp.proto b/proto/SetUpAvatarTeamRsp.proto
old mode 100644
new mode 100755
index fdb634b..dbcc81d
--- a/proto/SetUpAvatarTeamRsp.proto
+++ b/proto/SetUpAvatarTeamRsp.proto
@@ -2,9 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SetUpAvatarTeamRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1744;
+ }
+
int32 retcode = 1;
- uint32 teamId = 2;
- repeated uint64 avatarTeamGuidList = 3;
- uint64 curAvatarGuid = 4;
+ uint32 team_id = 2;
+ repeated uint64 avatar_team_guid_list = 3;
+ uint64 cur_avatar_guid = 4;
}
diff --git a/proto/Shop.proto b/proto/Shop.proto
old mode 100644
new mode 100755
index 2172757..a5b9ad6
--- a/proto/Shop.proto
+++ b/proto/Shop.proto
@@ -2,16 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "ShopCardProduct.proto";
import "ShopGoods.proto";
import "ShopMcoinProduct.proto";
+import "ShopCardProduct.proto";
+import "ShopConcertProduct.proto";
message Shop {
- uint32 shopType = 1;
- repeated ShopGoods goodsList = 2;
- repeated ShopMcoinProduct mcoinProductList = 3;
- repeated ShopCardProduct cardProductList = 4;
- uint32 nextRefreshTime = 6;
- uint32 cityId = 7;
- uint32 cityReputationLevel = 8;
+ uint32 shop_type = 1;
+ repeated ShopGoods goods_list = 2;
+ repeated ShopMcoinProduct mcoin_product_list = 3;
+ repeated ShopCardProduct card_product_list = 4;
+ uint32 next_refresh_time = 6;
+ uint32 city_id = 7;
+ uint32 city_reputation_level = 8;
+ repeated ShopConcertProduct concert_product_list = 9;
}
diff --git a/proto/ShopCardProduct.proto b/proto/ShopCardProduct.proto
old mode 100644
new mode 100755
index 88b95f7..4597100
--- a/proto/ShopCardProduct.proto
+++ b/proto/ShopCardProduct.proto
@@ -2,17 +2,22 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "ResinCard.proto";
+import "ItemParam.proto";
message ShopCardProduct {
- string productId = 1;
- string priceTier = 2;
- uint32 mcoinBase = 3;
- uint32 hcoinPerDay = 4;
- uint32 days = 5;
- uint32 remainRewardDays = 6;
- uint32 cardProductType = 7;
- oneof extraCardData {
- ResinCard resinCard = 101;
+ message ResinCard {
+ repeated ItemParam base_item_list = 1;
+ repeated ItemParam per_day_item_list = 2;
}
+
+ oneof ExtraCardData {
+ ResinCard resin_card = 101;
+ }
+ string product_id = 1;
+ string price_tier = 2;
+ uint32 mcoin_base = 3;
+ uint32 hcoin_per_day = 4;
+ uint32 days = 5;
+ uint32 remain_reward_days = 6;
+ uint32 card_product_type = 7;
}
diff --git a/proto/ShopConcertProduct.proto b/proto/ShopConcertProduct.proto
new file mode 100644
index 0000000..e91f4b1
--- /dev/null
+++ b/proto/ShopConcertProduct.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message ShopConcertProduct {
+ string product_id = 1;
+ string price_tier = 2;
+ uint32 obtain_count = 3;
+ uint32 obtain_limit = 4;
+ uint32 begin_time = 5;
+ uint32 end_time = 6;
+ uint32 buy_times = 7;
+}
diff --git a/proto/ShopGoods.proto b/proto/ShopGoods.proto
old mode 100644
new mode 100755
index 672578c..ea4a371
--- a/proto/ShopGoods.proto
+++ b/proto/ShopGoods.proto
@@ -5,20 +5,24 @@ option java_package = "emu.grasscutter.net.proto";
import "ItemParam.proto";
message ShopGoods {
- uint32 goodsId = 1;
- ItemParam goodsItem = 2;
+ uint32 goods_id = 1;
+ ItemParam goods_item = 2;
uint32 scoin = 3;
uint32 hcoin = 4;
- repeated ItemParam costItemList = 5;
- uint32 boughtNum = 6;
- uint32 buyLimit = 7;
- uint32 beginTime = 8;
- uint32 endTime = 9;
- uint32 nextRefreshTime = 10;
- uint32 minLevel = 11;
- uint32 maxLevel = 12;
- repeated uint32 preGoodsIdList = 13;
+ repeated ItemParam cost_item_list = 5;
+ uint32 bought_num = 6;
+ uint32 buy_limit = 7;
+ uint32 begin_time = 8;
+ uint32 end_time = 9;
+ uint32 next_refresh_time = 10;
+ uint32 min_level = 11;
+ uint32 max_level = 12;
+ repeated uint32 pre_goods_id_list = 13;
uint32 mcoin = 14;
- uint32 disableType = 15;
- uint32 secondarySheetId = 16;
+ uint32 disable_type = 15;
+ uint32 secondary_sheet_id = 16;
+ uint32 discount_id = 17;
+ uint32 discount_begin_time = 18;
+ uint32 discount_end_time = 19;
+ uint32 single_limit = 20;
}
diff --git a/proto/ShopGoodsDisableType.proto b/proto/ShopGoodsDisableType.proto
old mode 100644
new mode 100755
index 2c1b19b..cd1608b
--- a/proto/ShopGoodsDisableType.proto
+++ b/proto/ShopGoodsDisableType.proto
@@ -3,7 +3,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum ShopGoodsDisableType {
- ShopGoodsDisableNone = 0;
- ShopGoodsDisableTalentFull = 1;
- ShopGoodsDisableFurnitureFormulaUnlocked = 2;
+ SHOP_GOODS_DISABLE_NONE = 0;
+ SHOP_GOODS_DISABLE_TALENT_FULL = 1;
+ SHOP_GOODS_DISABLE_FURNITURE_FORMULA_UNLOCKED = 2;
+ SHOP_GOODS_DISABLE_COSTUME_UNLOCKED = 3;
}
diff --git a/proto/ShopMcoinProduct.proto b/proto/ShopMcoinProduct.proto
old mode 100644
new mode 100755
index 53f3dcb..3962ad1
--- a/proto/ShopMcoinProduct.proto
+++ b/proto/ShopMcoinProduct.proto
@@ -2,12 +2,13 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ShopMcoinProduct {
- string productId = 1;
- string priceTier = 2;
- uint32 mcoinBase = 3;
- uint32 mcoinNonFirst = 4;
- uint32 mcoinFirst = 5;
- uint32 boughtNum = 6;
- bool isAudit = 7;
+ string product_id = 1;
+ string price_tier = 2;
+ uint32 mcoin_base = 3;
+ uint32 mcoin_non_first = 4;
+ uint32 mcoin_first = 5;
+ uint32 bought_num = 6;
+ bool is_audit = 7;
}
diff --git a/proto/ShortAbilityHashPair.proto b/proto/ShortAbilityHashPair.proto
old mode 100644
new mode 100755
index 0eaf104..ec02252
--- a/proto/ShortAbilityHashPair.proto
+++ b/proto/ShortAbilityHashPair.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message ShortAbilityHashPair {
- int32 abilityNameHash = 1;
- int32 abilityConfigHash = 2;
+ int32 ability_name_hash = 1;
+ int32 ability_config_hash = 2;
}
diff --git a/proto/SitReq.proto b/proto/SitReq.proto
deleted file mode 100644
index 4a2b76e..0000000
--- a/proto/SitReq.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-import "Vector.proto";
-
-message SitReq {
- uint64 chair_id = 1;
- Vector position = 2;
-}
diff --git a/proto/SitRsp.proto b/proto/SitRsp.proto
deleted file mode 100644
index 16b3097..0000000
--- a/proto/SitRsp.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-import "Vector.proto";
-
-message SitRsp {
- uint32 entity_id = 2;
- Vector position = 3;
- uint64 chair_id = 4;
-}
diff --git a/proto/SocialDetail.proto b/proto/SocialDetail.proto
old mode 100644
new mode 100755
index bc97aa1..0d8752c
--- a/proto/SocialDetail.proto
+++ b/proto/SocialDetail.proto
@@ -3,32 +3,35 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Birthday.proto";
+import "FriendOnlineState.proto";
import "FriendEnterHomeOption.proto";
-import "HeadImage.proto";
+import "ProfilePicture.proto";
import "SocialShowAvatarInfo.proto";
message SocialDetail {
uint32 uid = 1;
string nickname = 2;
uint32 level = 3;
+ uint32 avatar_id = 4;
string signature = 5;
Birthday birthday = 6;
- uint32 worldLevel = 7;
- uint32 unk1 = 9;
- //FriendOnlineState onlineState = 10;
- //bool isMpModeAvailable = 10;
- bool isFriend = 11;
- uint32 unk3 = 12;
- uint32 lastActiveTime = 13;
- uint32 nameCardId = 14;
- bool isInBlacklist = 15;
- bool isChatNoDisturb = 16;
- string remarkName = 17;
- uint32 finishAchievementNum = 18;
- uint32 towerFloorIndex = 19;
- uint32 towerLevelIndex = 20;
- bool isShowAvatar = 21;
- repeated SocialShowAvatarInfo showAvatarInfoList = 22;
- FriendEnterHomeOption friendEnterHomeOption = 23;
- HeadImage avatar = 25;
+ uint32 world_level = 7;
+ repeated uint32 reserved_list = 8;
+ FriendOnlineState online_state = 9;
+ uint32 param = 10;
+ bool is_friend = 11;
+ bool is_mp_mode_available = 12;
+ string online_id = 13;
+ uint32 name_card_id = 14;
+ bool is_in_blacklist = 15;
+ bool is_chat_no_disturb = 16;
+ string remark_name = 17;
+ uint32 finish_achievement_num = 18;
+ uint32 tower_floor_index = 19;
+ uint32 tower_level_index = 20;
+ bool is_show_avatar = 21;
+ repeated SocialShowAvatarInfo show_avatar_info_list = 22;
+ repeated uint32 show_name_card_id_list = 23;
+ FriendEnterHomeOption friend_enter_home_option = 24;
+ ProfilePicture profile_picture = 25;
}
diff --git a/proto/SocialShowAvatarInfo.proto b/proto/SocialShowAvatarInfo.proto
old mode 100644
new mode 100755
index 921cb29..c682d36
--- a/proto/SocialShowAvatarInfo.proto
+++ b/proto/SocialShowAvatarInfo.proto
@@ -2,7 +2,9 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message SocialShowAvatarInfo {
- uint32 avatarId = 1;
+ uint32 avatar_id = 1;
uint32 level = 2;
+ uint32 costume_id = 3;
}
diff --git a/proto/StatueGadgetInfo.proto b/proto/StatueGadgetInfo.proto
new file mode 100644
index 0000000..6bf5de6
--- /dev/null
+++ b/proto/StatueGadgetInfo.proto
@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message StatueGadgetInfo {
+ repeated uint32 opened_statue_uid_list = 1;
+}
diff --git a/proto/StopServerInfo.proto b/proto/StopServerInfo.proto
new file mode 100644
index 0000000..3dc24ec
--- /dev/null
+++ b/proto/StopServerInfo.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message StopServerInfo {
+ uint32 stop_begin_time = 1;
+ uint32 stop_end_time = 2;
+ string url = 3;
+ string content_msg = 4;
+}
diff --git a/proto/StoreItemChangeNotify.proto b/proto/StoreItemChangeNotify.proto
old mode 100644
new mode 100755
index 270d5e4..c76d0ef
--- a/proto/StoreItemChangeNotify.proto
+++ b/proto/StoreItemChangeNotify.proto
@@ -2,10 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "Item.proto";
import "StoreType.proto";
+import "Item.proto";
message StoreItemChangeNotify {
- StoreType storeType = 1;
- repeated Item itemList = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 689;
+ }
+
+ StoreType store_type = 1;
+ repeated Item item_list = 2;
}
diff --git a/proto/StoreItemDelNotify.proto b/proto/StoreItemDelNotify.proto
old mode 100644
new mode 100755
index 69a70a8..bf9f232
--- a/proto/StoreItemDelNotify.proto
+++ b/proto/StoreItemDelNotify.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "StoreType.proto";
message StoreItemDelNotify {
- StoreType storeType = 1;
- repeated uint64 guidList = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 684;
+ }
+
+ StoreType store_type = 1;
+ repeated uint64 guid_list = 2;
}
diff --git a/proto/StoreType.proto b/proto/StoreType.proto
old mode 100644
new mode 100755
index 78e35b4..91163c5
--- a/proto/StoreType.proto
+++ b/proto/StoreType.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum StoreType {
- StoreNone = 0;
- StorePack = 1;
- StoreDepot = 2;
+ STORE_NONE = 0;
+ STORE_PACK = 1;
+ STORE_DEPOT = 2;
}
diff --git a/proto/StoreWeightLimitNotify.proto b/proto/StoreWeightLimitNotify.proto
old mode 100644
new mode 100755
index 236bacd..24e5856
--- a/proto/StoreWeightLimitNotify.proto
+++ b/proto/StoreWeightLimitNotify.proto
@@ -5,10 +5,18 @@ option java_package = "emu.grasscutter.net.proto";
import "StoreType.proto";
message StoreWeightLimitNotify {
- StoreType storeType = 1;
- uint32 weightLimit = 3;
- uint32 materialCountLimit = 4;
- uint32 weaponCountLimit = 5;
- uint32 reliquaryCountLimit = 6;
- uint32 furnitureCountLimit = 7;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 618;
+ }
+
+ StoreType store_type = 1;
+ uint32 weight_limit = 3;
+ uint32 material_count_limit = 4;
+ uint32 weapon_count_limit = 5;
+ uint32 reliquary_count_limit = 6;
+ uint32 furniture_count_limit = 7;
}
diff --git a/proto/SyncScenePlayTeamEntityNotify.proto b/proto/SyncScenePlayTeamEntityNotify.proto
old mode 100644
new mode 100755
index 1ffe7be..e14237d
--- a/proto/SyncScenePlayTeamEntityNotify.proto
+++ b/proto/SyncScenePlayTeamEntityNotify.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+import "PlayTeamEntityInfo.proto";
+
message SyncScenePlayTeamEntityNotify {
- uint32 sceneId = 1;
- //repeated PlayTeamEntityInfo entityInfoList = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 3375;
+ }
+
+ uint32 scene_id = 1;
+ repeated PlayTeamEntityInfo entity_info_list = 2;
}
diff --git a/proto/SyncTeamEntityNotify.proto b/proto/SyncTeamEntityNotify.proto
old mode 100644
new mode 100755
index 1555e37..e415251
--- a/proto/SyncTeamEntityNotify.proto
+++ b/proto/SyncTeamEntityNotify.proto
@@ -5,6 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "TeamEntityInfo.proto";
message SyncTeamEntityNotify {
- uint32 sceneId = 1;
- repeated TeamEntityInfo teamEntityInfoList = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 308;
+ }
+
+ uint32 scene_id = 1;
+ repeated TeamEntityInfo team_entity_info_list = 2;
}
diff --git a/proto/SystemHint.proto b/proto/SystemHint.proto
old mode 100644
new mode 100755
diff --git a/proto/TakePlayerLevelRewardReq.proto b/proto/TakePlayerLevelRewardReq.proto
old mode 100644
new mode 100755
index 1316ca5..fbaa3c1
--- a/proto/TakePlayerLevelRewardReq.proto
+++ b/proto/TakePlayerLevelRewardReq.proto
@@ -1,7 +1,17 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-message TakePlayerLevelRewardReq {
- uint32 level = 1;
-}
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message TakePlayerLevelRewardReq {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 173;
+ }
+
+ uint32 level = 1;
+}
diff --git a/proto/TakePlayerLevelRewardRsp.proto b/proto/TakePlayerLevelRewardRsp.proto
old mode 100644
new mode 100755
index a2abb7c..ec1944c
--- a/proto/TakePlayerLevelRewardRsp.proto
+++ b/proto/TakePlayerLevelRewardRsp.proto
@@ -1,9 +1,18 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-message TakePlayerLevelRewardRsp {
- int32 retcode = 1;
- uint32 level = 2;
- uint32 rewardId = 3;
-}
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message TakePlayerLevelRewardRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 102;
+ }
+
+ int32 retcode = 1;
+ uint32 level = 2;
+ uint32 reward_id = 3;
+}
diff --git a/proto/TakeoffEquipReq.proto b/proto/TakeoffEquipReq.proto
old mode 100644
new mode 100755
index bcd6278..e956fae
--- a/proto/TakeoffEquipReq.proto
+++ b/proto/TakeoffEquipReq.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message TakeoffEquipReq {
- uint64 avatarGuid = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 619;
+ }
+
+ uint64 avatar_guid = 1;
uint32 slot = 2;
}
diff --git a/proto/TakeoffEquipRsp.proto b/proto/TakeoffEquipRsp.proto
old mode 100644
new mode 100755
index ded1496..db6dced
--- a/proto/TakeoffEquipRsp.proto
+++ b/proto/TakeoffEquipRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message TakeoffEquipRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 614;
+ }
+
int32 retcode = 1;
- uint64 avatarGuid = 2;
+ uint64 avatar_guid = 2;
uint32 slot = 3;
}
diff --git a/proto/TeamEnterSceneInfo.proto b/proto/TeamEnterSceneInfo.proto
old mode 100644
new mode 100755
index d0144a8..b6adbe8
--- a/proto/TeamEnterSceneInfo.proto
+++ b/proto/TeamEnterSceneInfo.proto
@@ -3,9 +3,10 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AbilitySyncStateInfo.proto";
+import "AbilityControlBlock.proto";
message TeamEnterSceneInfo {
- uint32 teamEntityId = 1;
- AbilitySyncStateInfo teamAbilityInfo = 2;
- AbilitySyncStateInfo unk = 3;
+ uint32 team_entity_id = 1;
+ AbilitySyncStateInfo team_ability_info = 2;
+ AbilityControlBlock ability_control_block = 3;
}
diff --git a/proto/TeamEntityInfo.proto b/proto/TeamEntityInfo.proto
old mode 100644
new mode 100755
index 5f0240a..9b09ff0
--- a/proto/TeamEntityInfo.proto
+++ b/proto/TeamEntityInfo.proto
@@ -5,7 +5,7 @@ option java_package = "emu.grasscutter.net.proto";
import "AbilitySyncStateInfo.proto";
message TeamEntityInfo {
- uint32 teamEntityId = 1;
- uint32 authorityPeerId = 2;
- AbilitySyncStateInfo teamAbilityInfo = 3;
+ uint32 team_entity_id = 1;
+ uint32 authority_peer_id = 2;
+ AbilitySyncStateInfo team_ability_info = 3;
}
diff --git a/proto/TeamResonanceChangeNotify.proto b/proto/TeamResonanceChangeNotify.proto
old mode 100644
new mode 100755
index 592fc8a..fe8e8b4
--- a/proto/TeamResonanceChangeNotify.proto
+++ b/proto/TeamResonanceChangeNotify.proto
@@ -5,5 +5,13 @@ option java_package = "emu.grasscutter.net.proto";
import "AvatarTeamResonanceInfo.proto";
message TeamResonanceChangeNotify {
- repeated AvatarTeamResonanceInfo infoList = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1014;
+ }
+
+ repeated AvatarTeamResonanceInfo info_list = 1;
}
diff --git a/proto/TowerAllDataRsp.proto b/proto/TowerAllDataRsp.proto
old mode 100644
new mode 100755
index 7fde18c..e99d628
--- a/proto/TowerAllDataRsp.proto
+++ b/proto/TowerAllDataRsp.proto
@@ -3,25 +3,33 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "TowerCurLevelRecord.proto";
-import "TowerFloorRecord.proto";
import "TowerMonthlyBrief.proto";
+import "TowerFloorRecord.proto";
message TowerAllDataRsp {
- uint32 towerScheduleId = 1;
- repeated TowerFloorRecord towerFloorRecordList = 2;
- uint32 dailyFloorId = 3;
- uint32 dailyLevelIndex = 4;
- TowerCurLevelRecord curLevelRecord = 5;
- uint32 nextScheduleChangeTime = 6;
- map floorOpenTimeMap = 7;
- bool isFirstInteract = 8;
- TowerMonthlyBrief monthlyBrief = 9;
- uint32 skipToFloorIndex = 10;
- uint32 commemorativeRewardId = 11;
- map skipFloorGrantedRewardItemMap = 12;
- uint32 validTowerRecordNum = 13;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 2461;
+ }
+
+ uint32 tower_schedule_id = 1;
+ repeated TowerFloorRecord tower_floor_record_list = 2;
+ uint32 daily_floor_id = 3;
+ uint32 daily_level_index = 4;
+ TowerCurLevelRecord cur_level_record = 5;
+ uint32 next_schedule_change_time = 6;
+ map floor_open_time_map = 7;
+ bool is_first_interact = 8;
+ TowerMonthlyBrief monthly_brief = 9;
+ uint32 skip_to_floor_index = 10;
+ uint32 commemorative_reward_id = 11;
+ map skip_floor_granted_reward_item_map = 12;
+ uint32 valid_tower_record_num = 13;
int32 retcode = 14;
- bool isFinishedEntranceFloor = 15;
- uint32 scheduleStartTime = 16;
- TowerMonthlyBrief lastScheduleMonthlyBrief = 17;
+ bool is_finished_entrance_floor = 15;
+ uint32 schedule_start_time = 16;
+ TowerMonthlyBrief last_schedule_monthly_brief = 17;
}
diff --git a/proto/TowerCurLevelRecord.proto b/proto/TowerCurLevelRecord.proto
old mode 100644
new mode 100755
index 6c4a282..bfd4a84
--- a/proto/TowerCurLevelRecord.proto
+++ b/proto/TowerCurLevelRecord.proto
@@ -5,9 +5,9 @@ option java_package = "emu.grasscutter.net.proto";
import "TowerTeam.proto";
message TowerCurLevelRecord {
- uint32 curFloorId = 1;
- uint32 curLevelIndex = 2;
- repeated TowerTeam towerTeamList = 3;
- repeated uint32 buffIdList = 4;
- bool isEmpty = 5;
+ uint32 cur_floor_id = 1;
+ uint32 cur_level_index = 2;
+ repeated TowerTeam tower_team_list = 3;
+ repeated uint32 buff_id_list = 4;
+ bool is_empty = 5;
}
diff --git a/proto/TowerFloorRecord.proto b/proto/TowerFloorRecord.proto
old mode 100644
new mode 100755
index 7096d2b..d5a44c8
--- a/proto/TowerFloorRecord.proto
+++ b/proto/TowerFloorRecord.proto
@@ -5,8 +5,8 @@ option java_package = "emu.grasscutter.net.proto";
import "TowerLevelRecord.proto";
message TowerFloorRecord {
- uint32 floorId = 1;
- map passedLevelMap = 2;
- uint32 floorStarRewardProgress = 3;
- repeated TowerLevelRecord passedLevelRecordList = 4;
+ uint32 floor_id = 1;
+ map passed_level_map = 2;
+ uint32 floor_star_reward_progress = 3;
+ repeated TowerLevelRecord passed_level_record_list = 4;
}
diff --git a/proto/TowerLevelRecord.proto b/proto/TowerLevelRecord.proto
old mode 100644
new mode 100755
index e0e5d95..30dbed4
--- a/proto/TowerLevelRecord.proto
+++ b/proto/TowerLevelRecord.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message TowerLevelRecord {
- uint32 levelId = 1;
- repeated uint32 satisfiedCondList = 2;
+ uint32 level_id = 1;
+ repeated uint32 satisfied_cond_list = 2;
}
diff --git a/proto/TowerMonthlyBrief.proto b/proto/TowerMonthlyBrief.proto
old mode 100644
new mode 100755
index 69b0b90..fecf3ae
--- a/proto/TowerMonthlyBrief.proto
+++ b/proto/TowerMonthlyBrief.proto
@@ -2,9 +2,10 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message TowerMonthlyBrief {
- uint32 towerScheduleId = 1;
- uint32 bestFloorIndex = 2;
- uint32 bestLevelIndex = 3;
- uint32 totalStarCount = 4;
+ uint32 tower_schedule_id = 1;
+ uint32 best_floor_index = 2;
+ uint32 best_level_index = 3;
+ uint32 total_star_count = 4;
}
diff --git a/proto/TowerTeam.proto b/proto/TowerTeam.proto
old mode 100644
new mode 100755
index a478afe..374c593
--- a/proto/TowerTeam.proto
+++ b/proto/TowerTeam.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message TowerTeam {
- uint32 towerTeamId = 1;
- repeated uint64 avatarGuidList = 2;
+ uint32 tower_team_id = 1;
+ repeated uint64 avatar_guid_list = 2;
}
diff --git a/proto/TrackingIOInfo.proto b/proto/TrackingIOInfo.proto
old mode 100644
new mode 100755
index 0b618cb..976185e
--- a/proto/TrackingIOInfo.proto
+++ b/proto/TrackingIOInfo.proto
@@ -2,12 +2,13 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message TrackingIOInfo {
string appid = 1;
string deviceid = 2;
string mac = 3;
string rydevicetype = 4;
- string clientTz = 5;
- string currentCaid = 6;
- string cachedCaid = 7;
+ string client_tz = 5;
+ string current_caid = 6;
+ string cached_caid = 7;
}
diff --git a/proto/TrialAvatarGrantRecord.proto b/proto/TrialAvatarGrantRecord.proto
old mode 100644
new mode 100755
index 45dd737..fbfe446
--- a/proto/TrialAvatarGrantRecord.proto
+++ b/proto/TrialAvatarGrantRecord.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message TrialAvatarGrantRecord {
- uint32 grantReason = 1;
- uint32 fromParentQuestId = 2;
+ enum GrantReason {
+ INVALID = 0;
+ GRANT_BY_QUEST = 1;
+ GRANT_BY_TRIAL_AVATAR_ACTIVITY = 2;
+ GRANT_BY_DUNGEON_ELEMENT_CHALLENGE = 3;
+ GRANT_BY_MIST_TRIAL_ACTIVITY = 4;
+ GRANT_BY_SUMO_ACTIVITY = 5;
+ }
+
+ uint32 grant_reason = 1;
+ uint32 from_parent_quest_id = 2;
}
diff --git a/proto/TrialAvatarInfo.proto b/proto/TrialAvatarInfo.proto
old mode 100644
new mode 100755
index 867c723..d72fec8
--- a/proto/TrialAvatarInfo.proto
+++ b/proto/TrialAvatarInfo.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "Item.proto";
import "TrialAvatarGrantRecord.proto";
+import "Item.proto";
message TrialAvatarInfo {
- uint32 trialAvatarId = 1;
- repeated Item trialEquipList = 2;
- TrialAvatarGrantRecord grantRecord = 3;
+ uint32 trial_avatar_id = 1;
+ repeated Item trial_equip_list = 2;
+ TrialAvatarGrantRecord grant_record = 3;
}
diff --git a/proto/ReadMailNotify.proto b/proto/Uint32Pair.proto
similarity index 55%
rename from proto/ReadMailNotify.proto
rename to proto/Uint32Pair.proto
index d48c0d5..690943c 100644
--- a/proto/ReadMailNotify.proto
+++ b/proto/Uint32Pair.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-message ReadMailNotify {
- repeated uint32 mailIdList = 1;
+message Uint32Pair {
+ uint32 key = 1;
+ uint32 value = 2;
}
diff --git a/proto/UnionCmd.proto b/proto/UnionCmd.proto
old mode 100644
new mode 100755
index ed47476..5483633
--- a/proto/UnionCmd.proto
+++ b/proto/UnionCmd.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message UnionCmd {
- uint32 messageId = 1;
+ uint32 message_id = 1;
bytes body = 2;
}
diff --git a/proto/UnionCmdNotify.proto b/proto/UnionCmdNotify.proto
old mode 100644
new mode 100755
index 04ff8d9..6dc0437
--- a/proto/UnionCmdNotify.proto
+++ b/proto/UnionCmdNotify.proto
@@ -5,5 +5,14 @@ option java_package = "emu.grasscutter.net.proto";
import "UnionCmd.proto";
message UnionCmdNotify {
- repeated UnionCmd cmdList = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 19;
+ }
+
+ repeated UnionCmd cmd_list = 1;
}
diff --git a/proto/UnlockAvatarTalentReq.proto b/proto/UnlockAvatarTalentReq.proto
old mode 100644
new mode 100755
index b0cc420..b7dd1be
--- a/proto/UnlockAvatarTalentReq.proto
+++ b/proto/UnlockAvatarTalentReq.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message UnlockAvatarTalentReq {
- uint64 avatarGuid = 1;
- uint32 talentId = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 1049;
+ }
+
+ uint64 avatar_guid = 1;
+ uint32 talent_id = 2;
}
diff --git a/proto/UnlockAvatarTalentRsp.proto b/proto/UnlockAvatarTalentRsp.proto
old mode 100644
new mode 100755
index 8bb3234..5bbfe41
--- a/proto/UnlockAvatarTalentRsp.proto
+++ b/proto/UnlockAvatarTalentRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message UnlockAvatarTalentRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 1018;
+ }
+
int32 retcode = 1;
- uint64 avatarGuid = 2;
- uint32 talentId = 3;
+ uint64 avatar_guid = 2;
+ uint32 talent_id = 3;
}
diff --git a/proto/UnlockNameCardNotify.proto b/proto/UnlockNameCardNotify.proto
old mode 100644
new mode 100755
index 193be05..d423d6f
--- a/proto/UnlockNameCardNotify.proto
+++ b/proto/UnlockNameCardNotify.proto
@@ -2,6 +2,15 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message UnlockNameCardNotify {
- uint32 nameCardId = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 4092;
+ }
+
+ uint32 name_card_id = 1;
}
diff --git a/proto/UseItemReq.proto b/proto/UseItemReq.proto
old mode 100644
new mode 100755
index 227697d..27ab748
--- a/proto/UseItemReq.proto
+++ b/proto/UseItemReq.proto
@@ -2,10 +2,20 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message UseItemReq {
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 642;
+ }
+
uint64 guid = 1;
uint32 count = 2;
- uint64 targetGuid = 3;
- uint32 optionIdx = 4;
- bool isEnterMpDungeonTeam = 5;
+ uint64 target_guid = 3;
+ uint32 option_idx = 4;
+ bool is_enter_mp_dungeon_team = 5;
}
diff --git a/proto/UseItemRsp.proto b/proto/UseItemRsp.proto
old mode 100644
new mode 100755
index 03add18..de693da
--- a/proto/UseItemRsp.proto
+++ b/proto/UseItemRsp.proto
@@ -2,10 +2,19 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message UseItemRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 661;
+ }
+
int32 retcode = 1;
uint64 guid = 2;
- uint32 itemId = 3;
- uint64 targetGuid = 4;
- uint32 optionIdx = 5;
+ uint32 item_id = 3;
+ uint64 target_guid = 4;
+ uint32 option_idx = 5;
}
diff --git a/proto/Vector.proto b/proto/Vector.proto
old mode 100644
new mode 100755
index 562e743..0c05542
--- a/proto/Vector.proto
+++ b/proto/Vector.proto
@@ -2,8 +2,9 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message Vector {
- float x = 1;
- float y = 2;
- float z = 3;
+ float X = 1;
+ float Y = 2;
+ float Z = 3;
}
diff --git a/proto/VehicleInfo.proto b/proto/VehicleInfo.proto
new file mode 100644
index 0000000..06e6d01
--- /dev/null
+++ b/proto/VehicleInfo.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "VehicleMember.proto";
+
+message VehicleInfo {
+ repeated VehicleMember member_list = 1;
+ uint32 owner_uid = 2;
+ float cur_stamina = 3;
+}
diff --git a/proto/VehicleLocationInfo.proto b/proto/VehicleLocationInfo.proto
new file mode 100644
index 0000000..ea0b360
--- /dev/null
+++ b/proto/VehicleLocationInfo.proto
@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "Vector.proto";
+
+message VehicleLocationInfo {
+ uint32 entity_id = 1;
+ uint32 gadget_id = 2;
+ uint32 owner_uid = 3;
+ Vector pos = 4;
+ Vector rot = 5;
+ float cur_hp = 6;
+ float max_hp = 7;
+ repeated uint32 uid_list = 8;
+}
diff --git a/proto/VehicleMember.proto b/proto/VehicleMember.proto
new file mode 100644
index 0000000..31580d0
--- /dev/null
+++ b/proto/VehicleMember.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message VehicleMember {
+ uint32 uid = 1;
+ uint64 avatar_guid = 2;
+ uint32 pos = 3;
+}
diff --git a/proto/VisionType.proto b/proto/VisionType.proto
old mode 100644
new mode 100755
index c3c3049..444584c
--- a/proto/VisionType.proto
+++ b/proto/VisionType.proto
@@ -3,19 +3,23 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum VisionType {
- VisionNone = 0;
- VisionMeet = 1;
- VisionReborn = 2;
- VisionReplace = 3;
- VisionWaypointReborn = 4;
- VisionMiss = 5;
- VisionDie = 6;
- VisionGatherEscape = 7;
- VisionRefresh = 8;
- VisionTransport = 9;
- VisionReplaceDie = 10;
- VisionReplaceNoNotify = 11;
- VisionBorn = 12;
- VisionPickup = 13;
- VisionRemove = 14;
+ VISION_NONE = 0;
+ VISION_MEET = 1;
+ VISION_REBORN = 2;
+ VISION_REPLACE = 3;
+ VISION_WAYPOINT_REBORN = 4;
+ VISION_MISS = 5;
+ VISION_DIE = 6;
+ VISION_GATHER_ESCAPE = 7;
+ VISION_REFRESH = 8;
+ VISION_TRANSPORT = 9;
+ VISION_REPLACE_DIE = 10;
+ VISION_REPLACE_NO_NOTIFY = 11;
+ VISION_BORN = 12;
+ VISION_PICKUP = 13;
+ VISION_REMOVE = 14;
+ VISION_CHANGE_COSTUME = 15;
+ VISION_FISH_REFRESH = 16;
+ VISION_FISH_BIG_SHOCK = 17;
+ VISION_FISH_QTE_SUCC = 18;
}
diff --git a/proto/Weapon.proto b/proto/Weapon.proto
old mode 100644
new mode 100755
index e199f58..aedbbf8
--- a/proto/Weapon.proto
+++ b/proto/Weapon.proto
@@ -2,9 +2,10 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message Weapon {
uint32 level = 1;
uint32 exp = 2;
- uint32 promoteLevel = 3;
- map affixMap = 4;
+ uint32 promote_level = 3;
+ map affix_map = 4;
}
diff --git a/proto/WeaponAwakenReq.proto b/proto/WeaponAwakenReq.proto
old mode 100644
new mode 100755
index 2775c8d..4a04f45
--- a/proto/WeaponAwakenReq.proto
+++ b/proto/WeaponAwakenReq.proto
@@ -2,8 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message WeaponAwakenReq {
- uint64 targetWeaponGuid = 1;
- uint64 itemGuid = 2;
- map affixLevelMap = 3;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 656;
+ }
+
+ uint64 target_weapon_guid = 1;
+ uint64 item_guid = 2;
+ map affix_level_map = 3;
}
diff --git a/proto/WeaponAwakenRsp.proto b/proto/WeaponAwakenRsp.proto
old mode 100644
new mode 100755
index 2400cab..c715044
--- a/proto/WeaponAwakenRsp.proto
+++ b/proto/WeaponAwakenRsp.proto
@@ -2,11 +2,20 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message WeaponAwakenRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 692;
+ }
+
int32 retcode = 1;
- uint64 targetWeaponGuid = 2;
- uint32 targetWeaponAwakenLevel = 3;
- map oldAffixLevelMap = 4;
- map curAffixLevelMap = 5;
- uint64 avatarGuid = 6;
+ uint64 target_weapon_guid = 2;
+ uint32 target_weapon_awaken_level = 3;
+ map old_affix_level_map = 4;
+ map cur_affix_level_map = 5;
+ uint64 avatar_guid = 6;
}
diff --git a/proto/WeaponPromoteReq.proto b/proto/WeaponPromoteReq.proto
old mode 100644
new mode 100755
index dc47477..e7cf1f1
--- a/proto/WeaponPromoteReq.proto
+++ b/proto/WeaponPromoteReq.proto
@@ -2,6 +2,16 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message WeaponPromoteReq {
- uint64 targetWeaponGuid = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 647;
+ }
+
+ uint64 target_weapon_guid = 1;
}
diff --git a/proto/WeaponPromoteRsp.proto b/proto/WeaponPromoteRsp.proto
old mode 100644
new mode 100755
index efd7bfb..6df2aa7
--- a/proto/WeaponPromoteRsp.proto
+++ b/proto/WeaponPromoteRsp.proto
@@ -2,9 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message WeaponPromoteRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 606;
+ }
+
int32 retcode = 1;
- uint64 targetWeaponGuid = 2;
- uint32 oldPromoteLevel = 3;
- uint32 curPromoteLevel = 4;
+ uint64 target_weapon_guid = 2;
+ uint32 old_promote_level = 3;
+ uint32 cur_promote_level = 4;
}
diff --git a/proto/WeaponUpgradeReq.proto b/proto/WeaponUpgradeReq.proto
old mode 100644
new mode 100755
index 93e6962..860f439
--- a/proto/WeaponUpgradeReq.proto
+++ b/proto/WeaponUpgradeReq.proto
@@ -5,7 +5,16 @@ option java_package = "emu.grasscutter.net.proto";
import "ItemParam.proto";
message WeaponUpgradeReq {
- uint64 targetWeaponGuid = 1;
- repeated uint64 foodWeaponGuidList = 2;
- repeated ItemParam itemParamList = 3;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 670;
+ }
+
+ uint64 target_weapon_guid = 1;
+ repeated uint64 food_weapon_guid_list = 2;
+ repeated ItemParam item_param_list = 3;
}
diff --git a/proto/WeaponUpgradeRsp.proto b/proto/WeaponUpgradeRsp.proto
old mode 100644
new mode 100755
index 77a71f2..e15a82e
--- a/proto/WeaponUpgradeRsp.proto
+++ b/proto/WeaponUpgradeRsp.proto
@@ -5,9 +5,17 @@ option java_package = "emu.grasscutter.net.proto";
import "ItemParam.proto";
message WeaponUpgradeRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 632;
+ }
+
int32 retcode = 1;
- uint64 targetWeaponGuid = 2;
- uint32 oldLevel = 3;
- uint32 curLevel = 4;
- repeated ItemParam itemParamList = 5;
+ uint64 target_weapon_guid = 2;
+ uint32 old_level = 3;
+ uint32 cur_level = 4;
+ repeated ItemParam item_param_list = 5;
}
diff --git a/proto/WearEquipReq.proto b/proto/WearEquipReq.proto
old mode 100644
new mode 100755
index 805377d..d12c504
--- a/proto/WearEquipReq.proto
+++ b/proto/WearEquipReq.proto
@@ -2,7 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message WearEquipReq {
- uint64 avatarGuid = 1;
- uint64 equipGuid = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 691;
+ }
+
+ uint64 avatar_guid = 1;
+ uint64 equip_guid = 2;
}
diff --git a/proto/WearEquipRsp.proto b/proto/WearEquipRsp.proto
old mode 100644
new mode 100755
index 61bb366..01760f9
--- a/proto/WearEquipRsp.proto
+++ b/proto/WearEquipRsp.proto
@@ -2,8 +2,17 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message WearEquipRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 636;
+ }
+
int32 retcode = 1;
- uint64 avatarGuid = 2;
- uint64 equipGuid = 3;
+ uint64 avatar_guid = 2;
+ uint64 equip_guid = 3;
}
diff --git a/proto/WeatherInfo.proto b/proto/WeatherInfo.proto
new file mode 100644
index 0000000..2d9c84f
--- /dev/null
+++ b/proto/WeatherInfo.proto
@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message WeatherInfo {
+ uint32 weather_area_id = 1;
+}
diff --git a/proto/WeeklyBossResinDiscountInfo.proto b/proto/WeeklyBossResinDiscountInfo.proto
old mode 100644
new mode 100755
index 2c9a85e..740fa4d
--- a/proto/WeeklyBossResinDiscountInfo.proto
+++ b/proto/WeeklyBossResinDiscountInfo.proto
@@ -2,9 +2,10 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message WeeklyBossResinDiscountInfo {
- uint32 discountNum = 1;
- uint32 discountNumLimit = 2;
- uint32 resinCost = 3;
- uint32 originalResinCost = 4;
+ uint32 discount_num = 1;
+ uint32 discount_num_limit = 2;
+ uint32 resin_cost = 3;
+ uint32 original_resin_cost = 4;
}
diff --git a/proto/WorktopInfo.proto b/proto/WorktopInfo.proto
new file mode 100644
index 0000000..4efc17b
--- /dev/null
+++ b/proto/WorktopInfo.proto
@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message WorktopInfo {
+ repeated uint32 option_list = 1;
+ bool is_guest_can_operate = 2;
+}
diff --git a/proto/WorldDataNotify.proto b/proto/WorldDataNotify.proto
old mode 100644
new mode 100755
index 9bb4e73..345c279
--- a/proto/WorldDataNotify.proto
+++ b/proto/WorldDataNotify.proto
@@ -5,5 +5,20 @@ option java_package = "emu.grasscutter.net.proto";
import "PropValue.proto";
message WorldDataNotify {
- map worldPropMap = 1;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 3219;
+ }
+
+ enum DataType {
+ DATA_NONE = 0;
+ WORLD_LEVEL = 1;
+ IS_IN_MP_MODE = 2;
+ }
+
+ map world_prop_map = 1;
}
diff --git a/proto/WorldPlayerDieNotify.proto b/proto/WorldPlayerDieNotify.proto
old mode 100644
new mode 100755
index 36ecf04..e1e27b1
--- a/proto/WorldPlayerDieNotify.proto
+++ b/proto/WorldPlayerDieNotify.proto
@@ -5,10 +5,18 @@ option java_package = "emu.grasscutter.net.proto";
import "PlayerDieType.proto";
message WorldPlayerDieNotify {
- PlayerDieType dieType = 1;
- uint32 murdererEntityId = 2;
- oneof entity {
- uint32 monsterId = 3;
- uint32 gadgetId = 4;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 254;
}
+
+ oneof Entity {
+ uint32 monster_id = 3;
+ uint32 gadget_id = 4;
+ }
+ PlayerDieType die_type = 1;
+ uint32 murderer_entity_id = 2;
}
diff --git a/proto/WorldPlayerInfoNotify.proto b/proto/WorldPlayerInfoNotify.proto
old mode 100644
new mode 100755
index e9266b6..276940d
--- a/proto/WorldPlayerInfoNotify.proto
+++ b/proto/WorldPlayerInfoNotify.proto
@@ -5,6 +5,15 @@ option java_package = "emu.grasscutter.net.proto";
import "OnlinePlayerInfo.proto";
message WorldPlayerInfoNotify {
- repeated OnlinePlayerInfo playerInfoList = 1;
- repeated uint32 playerUidList = 2;
+ enum CmdId {
+ option allow_alias = true;
+ ENET_CHANNEL_ID = 0;
+ NONE = 0;
+ ENET_IS_RELIABLE = 1;
+ IS_ALLOW_CLIENT = 1;
+ CMD_ID = 3109;
+ }
+
+ repeated OnlinePlayerInfo player_info_list = 1;
+ repeated uint32 player_uid_list = 2;
}
diff --git a/proto/WorldPlayerLocationNotify.proto b/proto/WorldPlayerLocationNotify.proto
old mode 100644
new mode 100755
index c71898a..1b8e9d7
--- a/proto/WorldPlayerLocationNotify.proto
+++ b/proto/WorldPlayerLocationNotify.proto
@@ -2,8 +2,18 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-import "WorldPlayerLocationInfo.proto";
+import "PlayerLocationInfo.proto";
+import "PlayerWorldLocationInfo.proto";
message WorldPlayerLocationNotify {
- repeated WorldPlayerLocationInfo playerLocList = 2;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 253;
+ }
+
+ repeated PlayerLocationInfo player_loc_list = 1;
+ repeated PlayerWorldLocationInfo player_world_loc_list = 2;
}
diff --git a/proto/WorldPlayerRTTNotify.proto b/proto/WorldPlayerRTTNotify.proto
old mode 100644
new mode 100755
index 56474c1..a927198
--- a/proto/WorldPlayerRTTNotify.proto
+++ b/proto/WorldPlayerRTTNotify.proto
@@ -5,5 +5,13 @@ option java_package = "emu.grasscutter.net.proto";
import "PlayerRTTInfo.proto";
message WorldPlayerRTTNotify {
- repeated PlayerRTTInfo playerRttList = 1;
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 47;
+ }
+
+ repeated PlayerRTTInfo player_rtt_list = 1;
}
diff --git a/proto/WorldPlayerReviveRsp.proto b/proto/WorldPlayerReviveRsp.proto
old mode 100644
new mode 100755
index 1c823e8..d08ce1e
--- a/proto/WorldPlayerReviveRsp.proto
+++ b/proto/WorldPlayerReviveRsp.proto
@@ -2,6 +2,15 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
+
message WorldPlayerReviveRsp {
+ enum CmdId {
+ option allow_alias = true;
+ NONE = 0;
+ ENET_CHANNEL_ID = 0;
+ ENET_IS_RELIABLE = 1;
+ CMD_ID = 227;
+ }
+
int32 retcode = 1;
}