diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java
index 3c1cf4d8e..3cb2021d5 100644
--- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java
+++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java
@@ -82915,6 +82915,24 @@ public final class CommonProto {
*
*/
int getRedType();
+
+ // optional int32 sendTime = 6;
+ /**
+ * optional int32 sendTime = 6;
+ *
+ *
+ *发送时间 + *+ */ + boolean hasSendTime(); + /** + *
optional int32 sendTime = 6;
+ *
+ * + *发送时间 + *+ */ + int getSendTime(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.RedPackage} @@ -82992,6 +83010,11 @@ public final class CommonProto { redType_ = input.readInt32(); break; } + case 48: { + bitField0_ |= 0x00000020; + sendTime_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -83171,12 +83194,37 @@ public final class CommonProto { return redType_; } + // optional int32 sendTime = 6; + public static final int SENDTIME_FIELD_NUMBER = 6; + private int sendTime_; + /** + *
optional int32 sendTime = 6;
+ *
+ * + *发送时间 + *+ */ + public boolean hasSendTime() { + return ((bitField0_ & 0x00000020) == 0x00000020); + } + /** + *
optional int32 sendTime = 6;
+ *
+ * + *发送时间 + *+ */ + public int getSendTime() { + return sendTime_; + } + private void initFields() { userName_ = ""; redId_ = 0; isGet_ = 0; getCount_ = 0; redType_ = 0; + sendTime_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -83205,6 +83253,9 @@ public final class CommonProto { if (((bitField0_ & 0x00000010) == 0x00000010)) { output.writeInt32(5, redType_); } + if (((bitField0_ & 0x00000020) == 0x00000020)) { + output.writeInt32(6, sendTime_); + } getUnknownFields().writeTo(output); } @@ -83234,6 +83285,10 @@ public final class CommonProto { size += com.google.protobuf.CodedOutputStream .computeInt32Size(5, redType_); } + if (((bitField0_ & 0x00000020) == 0x00000020)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(6, sendTime_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -83360,6 +83415,8 @@ public final class CommonProto { bitField0_ = (bitField0_ & ~0x00000008); redType_ = 0; bitField0_ = (bitField0_ & ~0x00000010); + sendTime_ = 0; + bitField0_ = (bitField0_ & ~0x00000020); return this; } @@ -83408,6 +83465,10 @@ public final class CommonProto { to_bitField0_ |= 0x00000010; } result.redType_ = redType_; + if (((from_bitField0_ & 0x00000020) == 0x00000020)) { + to_bitField0_ |= 0x00000020; + } + result.sendTime_ = sendTime_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -83441,6 +83502,9 @@ public final class CommonProto { if (other.hasRedType()) { setRedType(other.getRedType()); } + if (other.hasSendTime()) { + setSendTime(other.getSendTime()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -83738,6 +83802,55 @@ public final class CommonProto { return this; } + // optional int32 sendTime = 6; + private int sendTime_ ; + /** + *
optional int32 sendTime = 6;
+ *
+ * + *发送时间 + *+ */ + public boolean hasSendTime() { + return ((bitField0_ & 0x00000020) == 0x00000020); + } + /** + *
optional int32 sendTime = 6;
+ *
+ * + *发送时间 + *+ */ + public int getSendTime() { + return sendTime_; + } + /** + *
optional int32 sendTime = 6;
+ *
+ * + *发送时间 + *+ */ + public Builder setSendTime(int value) { + bitField0_ |= 0x00000020; + sendTime_ = value; + onChanged(); + return this; + } + /** + *
optional int32 sendTime = 6;
+ *
+ * + *发送时间 + *+ */ + public Builder clearSendTime() { + bitField0_ = (bitField0_ & ~0x00000020); + sendTime_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.RedPackage) } @@ -83826,6 +83939,24 @@ public final class CommonProto { *
optional int32 itemId = 7;
*/
int getItemId();
+
+ // optional int32 position = 8;
+ /**
+ * optional int32 position = 8;
+ *
+ * + *公会职位 + *+ */ + boolean hasPosition(); + /** + *
optional int32 position = 8;
+ *
+ * + *公会职位 + *+ */ + int getPosition(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.RedOneDetail} @@ -83913,6 +84044,11 @@ public final class CommonProto { itemId_ = input.readInt32(); break; } + case 64: { + bitField0_ |= 0x00000080; + position_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -84092,6 +84228,30 @@ public final class CommonProto { return itemId_; } + // optional int32 position = 8; + public static final int POSITION_FIELD_NUMBER = 8; + private int position_; + /** + *
optional int32 position = 8;
+ *
+ * + *公会职位 + *+ */ + public boolean hasPosition() { + return ((bitField0_ & 0x00000080) == 0x00000080); + } + /** + *
optional int32 position = 8;
+ *
+ * + *公会职位 + *+ */ + public int getPosition() { + return position_; + } + private void initFields() { uid_ = 0; head_ = 0; @@ -84100,6 +84260,7 @@ public final class CommonProto { time_ = 0; count_ = 0; itemId_ = 0; + position_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -84134,6 +84295,9 @@ public final class CommonProto { if (((bitField0_ & 0x00000040) == 0x00000040)) { output.writeInt32(7, itemId_); } + if (((bitField0_ & 0x00000080) == 0x00000080)) { + output.writeInt32(8, position_); + } getUnknownFields().writeTo(output); } @@ -84171,6 +84335,10 @@ public final class CommonProto { size += com.google.protobuf.CodedOutputStream .computeInt32Size(7, itemId_); } + if (((bitField0_ & 0x00000080) == 0x00000080)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(8, position_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -84301,6 +84469,8 @@ public final class CommonProto { bitField0_ = (bitField0_ & ~0x00000020); itemId_ = 0; bitField0_ = (bitField0_ & ~0x00000040); + position_ = 0; + bitField0_ = (bitField0_ & ~0x00000080); return this; } @@ -84357,6 +84527,10 @@ public final class CommonProto { to_bitField0_ |= 0x00000040; } result.itemId_ = itemId_; + if (((from_bitField0_ & 0x00000080) == 0x00000080)) { + to_bitField0_ |= 0x00000080; + } + result.position_ = position_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -84396,6 +84570,9 @@ public final class CommonProto { if (other.hasItemId()) { setItemId(other.getItemId()); } + if (other.hasPosition()) { + setPosition(other.getPosition()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -84695,6 +84872,55 @@ public final class CommonProto { return this; } + // optional int32 position = 8; + private int position_ ; + /** + *
optional int32 position = 8;
+ *
+ * + *公会职位 + *+ */ + public boolean hasPosition() { + return ((bitField0_ & 0x00000080) == 0x00000080); + } + /** + *
optional int32 position = 8;
+ *
+ * + *公会职位 + *+ */ + public int getPosition() { + return position_; + } + /** + *
optional int32 position = 8;
+ *
+ * + *公会职位 + *+ */ + public Builder setPosition(int value) { + bitField0_ |= 0x00000080; + position_ = value; + onChanged(); + return this; + } + /** + *
optional int32 position = 8;
+ *
+ * + *公会职位 + *+ */ + public Builder clearPosition() { + bitField0_ = (bitField0_ & ~0x00000080); + position_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.RedOneDetail) } @@ -84706,1242 +84932,6 @@ public final class CommonProto { // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.RedOneDetail) } - public interface ExpeditionNodeInfoOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // optional int32 sortId = 1; - /** - *
optional int32 sortId = 1;
- *
- * - *节点id - *- */ - boolean hasSortId(); - /** - *
optional int32 sortId = 1;
- *
- * - *节点id - *- */ - int getSortId(); - - // optional int32 lay = 2; - /** - *
optional int32 lay = 2;
- *
- * - *节点层 - *- */ - boolean hasLay(); - /** - *
optional int32 lay = 2;
- *
- * - *节点层 - *- */ - int getLay(); - - // optional int32 type = 3; - /** - *
optional int32 type = 3;
- *
- * - *节点类型 - *- */ - boolean hasType(); - /** - *
optional int32 type = 3;
- *
- * - *节点类型 - *- */ - int getType(); - - // optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - boolean hasBossTeaminfo(); - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo getBossTeaminfo(); - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder getBossTeaminfoOrBuilder(); - - // optional int32 state = 5; - /** - *
optional int32 state = 5;
- *
- * - *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 - *- */ - boolean hasState(); - /** - *
optional int32 state = 5;
- *
- * - *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 - *- */ - int getState(); - - // repeated int32 holyEquipID = 6; - /** - *
repeated int32 holyEquipID = 6;
- *
- * - *圣物id - *- */ - java.util.List
repeated int32 holyEquipID = 6;
- *
- * - *圣物id - *- */ - int getHolyEquipIDCount(); - /** - *
repeated int32 holyEquipID = 6;
- *
- * - *圣物id - *- */ - int getHolyEquipID(int index); - } - /** - * Protobuf type {@code com.ljsd.jieling.protocols.ExpeditionNodeInfo} - * - *
- *猎妖之路节点信息 - *- */ - public static final class ExpeditionNodeInfo extends - com.google.protobuf.GeneratedMessage - implements ExpeditionNodeInfoOrBuilder { - // Use ExpeditionNodeInfo.newBuilder() to construct. - private ExpeditionNodeInfo(com.google.protobuf.GeneratedMessage.Builder> builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private ExpeditionNodeInfo(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final ExpeditionNodeInfo defaultInstance; - public static ExpeditionNodeInfo getDefaultInstance() { - return defaultInstance; - } - - public ExpeditionNodeInfo getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private ExpeditionNodeInfo( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - 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; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - sortId_ = input.readInt32(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - lay_ = input.readInt32(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - type_ = input.readInt32(); - break; - } - case 34: { - com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder subBuilder = null; - if (((bitField0_ & 0x00000008) == 0x00000008)) { - subBuilder = bossTeaminfo_.toBuilder(); - } - bossTeaminfo_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(bossTeaminfo_); - bossTeaminfo_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000008; - break; - } - case 40: { - bitField0_ |= 0x00000010; - state_ = input.readInt32(); - break; - } - case 48: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - holyEquipID_ = new java.util.ArrayList
optional int32 sortId = 1;
- *
- * - *节点id - *- */ - public boolean hasSortId() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - *
optional int32 sortId = 1;
- *
- * - *节点id - *- */ - public int getSortId() { - return sortId_; - } - - // optional int32 lay = 2; - public static final int LAY_FIELD_NUMBER = 2; - private int lay_; - /** - *
optional int32 lay = 2;
- *
- * - *节点层 - *- */ - public boolean hasLay() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - *
optional int32 lay = 2;
- *
- * - *节点层 - *- */ - public int getLay() { - return lay_; - } - - // optional int32 type = 3; - public static final int TYPE_FIELD_NUMBER = 3; - private int type_; - /** - *
optional int32 type = 3;
- *
- * - *节点类型 - *- */ - public boolean hasType() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - *
optional int32 type = 3;
- *
- * - *节点类型 - *- */ - public int getType() { - return type_; - } - - // optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; - public static final int BOSSTEAMINFO_FIELD_NUMBER = 4; - private com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo bossTeaminfo_; - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - public boolean hasBossTeaminfo() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo getBossTeaminfo() { - return bossTeaminfo_; - } - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder getBossTeaminfoOrBuilder() { - return bossTeaminfo_; - } - - // optional int32 state = 5; - public static final int STATE_FIELD_NUMBER = 5; - private int state_; - /** - *
optional int32 state = 5;
- *
- * - *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 - *- */ - public boolean hasState() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - /** - *
optional int32 state = 5;
- *
- * - *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 - *- */ - public int getState() { - return state_; - } - - // repeated int32 holyEquipID = 6; - public static final int HOLYEQUIPID_FIELD_NUMBER = 6; - private java.util.List
repeated int32 holyEquipID = 6;
- *
- * - *圣物id - *- */ - public java.util.List
repeated int32 holyEquipID = 6;
- *
- * - *圣物id - *- */ - public int getHolyEquipIDCount() { - return holyEquipID_.size(); - } - /** - *
repeated int32 holyEquipID = 6;
- *
- * - *圣物id - *- */ - public int getHolyEquipID(int index) { - return holyEquipID_.get(index); - } - - private void initFields() { - sortId_ = 0; - lay_ = 0; - type_ = 0; - bossTeaminfo_ = com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance(); - state_ = 0; - holyEquipID_ = java.util.Collections.emptyList(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeInt32(1, sortId_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeInt32(2, lay_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeInt32(3, type_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeMessage(4, bossTeaminfo_); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeInt32(5, state_); - } - for (int i = 0; i < holyEquipID_.size(); i++) { - output.writeInt32(6, holyEquipID_.get(i)); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, sortId_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(2, lay_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(3, type_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, bossTeaminfo_); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(5, state_); - } - { - int dataSize = 0; - for (int i = 0; i < holyEquipID_.size(); i++) { - dataSize += com.google.protobuf.CodedOutputStream - .computeInt32SizeNoTag(holyEquipID_.get(i)); - } - size += dataSize; - size += 1 * getHolyEquipIDList().size(); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code com.ljsd.jieling.protocols.ExpeditionNodeInfo} - * - *
- *猎妖之路节点信息 - *- */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder
optional int32 sortId = 1;
- *
- * - *节点id - *- */ - public boolean hasSortId() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - *
optional int32 sortId = 1;
- *
- * - *节点id - *- */ - public int getSortId() { - return sortId_; - } - /** - *
optional int32 sortId = 1;
- *
- * - *节点id - *- */ - public Builder setSortId(int value) { - bitField0_ |= 0x00000001; - sortId_ = value; - onChanged(); - return this; - } - /** - *
optional int32 sortId = 1;
- *
- * - *节点id - *- */ - public Builder clearSortId() { - bitField0_ = (bitField0_ & ~0x00000001); - sortId_ = 0; - onChanged(); - return this; - } - - // optional int32 lay = 2; - private int lay_ ; - /** - *
optional int32 lay = 2;
- *
- * - *节点层 - *- */ - public boolean hasLay() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - *
optional int32 lay = 2;
- *
- * - *节点层 - *- */ - public int getLay() { - return lay_; - } - /** - *
optional int32 lay = 2;
- *
- * - *节点层 - *- */ - public Builder setLay(int value) { - bitField0_ |= 0x00000002; - lay_ = value; - onChanged(); - return this; - } - /** - *
optional int32 lay = 2;
- *
- * - *节点层 - *- */ - public Builder clearLay() { - bitField0_ = (bitField0_ & ~0x00000002); - lay_ = 0; - onChanged(); - return this; - } - - // optional int32 type = 3; - private int type_ ; - /** - *
optional int32 type = 3;
- *
- * - *节点类型 - *- */ - public boolean hasType() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - *
optional int32 type = 3;
- *
- * - *节点类型 - *- */ - public int getType() { - return type_; - } - /** - *
optional int32 type = 3;
- *
- * - *节点类型 - *- */ - public Builder setType(int value) { - bitField0_ |= 0x00000004; - type_ = value; - onChanged(); - return this; - } - /** - *
optional int32 type = 3;
- *
- * - *节点类型 - *- */ - public Builder clearType() { - bitField0_ = (bitField0_ & ~0x00000004); - type_ = 0; - onChanged(); - return this; - } - - // optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; - private com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo bossTeaminfo_ = com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder> bossTeaminfoBuilder_; - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - public boolean hasBossTeaminfo() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo getBossTeaminfo() { - if (bossTeaminfoBuilder_ == null) { - return bossTeaminfo_; - } else { - return bossTeaminfoBuilder_.getMessage(); - } - } - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - public Builder setBossTeaminfo(com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo value) { - if (bossTeaminfoBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - bossTeaminfo_ = value; - onChanged(); - } else { - bossTeaminfoBuilder_.setMessage(value); - } - bitField0_ |= 0x00000008; - return this; - } - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - public Builder setBossTeaminfo( - com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder builderForValue) { - if (bossTeaminfoBuilder_ == null) { - bossTeaminfo_ = builderForValue.build(); - onChanged(); - } else { - bossTeaminfoBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000008; - return this; - } - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - public Builder mergeBossTeaminfo(com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo value) { - if (bossTeaminfoBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008) && - bossTeaminfo_ != com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance()) { - bossTeaminfo_ = - com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.newBuilder(bossTeaminfo_).mergeFrom(value).buildPartial(); - } else { - bossTeaminfo_ = value; - } - onChanged(); - } else { - bossTeaminfoBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000008; - return this; - } - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - public Builder clearBossTeaminfo() { - if (bossTeaminfoBuilder_ == null) { - bossTeaminfo_ = com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance(); - onChanged(); - } else { - bossTeaminfoBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000008); - return this; - } - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder getBossTeaminfoBuilder() { - bitField0_ |= 0x00000008; - onChanged(); - return getBossTeaminfoFieldBuilder().getBuilder(); - } - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder getBossTeaminfoOrBuilder() { - if (bossTeaminfoBuilder_ != null) { - return bossTeaminfoBuilder_.getMessageOrBuilder(); - } else { - return bossTeaminfo_; - } - } - /** - *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
- *
- * - *节点队伍信息 - *- */ - private com.google.protobuf.SingleFieldBuilder< - com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder> - getBossTeaminfoFieldBuilder() { - if (bossTeaminfoBuilder_ == null) { - bossTeaminfoBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder>( - bossTeaminfo_, - getParentForChildren(), - isClean()); - bossTeaminfo_ = null; - } - return bossTeaminfoBuilder_; - } - - // optional int32 state = 5; - private int state_ ; - /** - *
optional int32 state = 5;
- *
- * - *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 - *- */ - public boolean hasState() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - /** - *
optional int32 state = 5;
- *
- * - *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 - *- */ - public int getState() { - return state_; - } - /** - *
optional int32 state = 5;
- *
- * - *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 - *- */ - public Builder setState(int value) { - bitField0_ |= 0x00000010; - state_ = value; - onChanged(); - return this; - } - /** - *
optional int32 state = 5;
- *
- * - *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 - *- */ - public Builder clearState() { - bitField0_ = (bitField0_ & ~0x00000010); - state_ = 0; - onChanged(); - return this; - } - - // repeated int32 holyEquipID = 6; - private java.util.List
repeated int32 holyEquipID = 6;
- *
- * - *圣物id - *- */ - public java.util.List
repeated int32 holyEquipID = 6;
- *
- * - *圣物id - *- */ - public int getHolyEquipIDCount() { - return holyEquipID_.size(); - } - /** - *
repeated int32 holyEquipID = 6;
- *
- * - *圣物id - *- */ - public int getHolyEquipID(int index) { - return holyEquipID_.get(index); - } - /** - *
repeated int32 holyEquipID = 6;
- *
- * - *圣物id - *- */ - public Builder setHolyEquipID( - int index, int value) { - ensureHolyEquipIDIsMutable(); - holyEquipID_.set(index, value); - onChanged(); - return this; - } - /** - *
repeated int32 holyEquipID = 6;
- *
- * - *圣物id - *- */ - public Builder addHolyEquipID(int value) { - ensureHolyEquipIDIsMutable(); - holyEquipID_.add(value); - onChanged(); - return this; - } - /** - *
repeated int32 holyEquipID = 6;
- *
- * - *圣物id - *- */ - public Builder addAllHolyEquipID( - java.lang.Iterable extends java.lang.Integer> values) { - ensureHolyEquipIDIsMutable(); - super.addAll(values, holyEquipID_); - onChanged(); - return this; - } - /** - *
repeated int32 holyEquipID = 6;
- *
- * - *圣物id - *- */ - public Builder clearHolyEquipID() { - holyEquipID_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000020); - onChanged(); - return this; - } - - // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ExpeditionNodeInfo) - } - - static { - defaultInstance = new ExpeditionNodeInfo(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ExpeditionNodeInfo) - } - public interface ExpeditionSimpleBossInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { @@ -87560,6 +86550,1242 @@ public final class CommonProto { // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ExpeditionTeamInfo) } + public interface ExpeditionNodeInfoOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional int32 sortId = 1; + /** + *
optional int32 sortId = 1;
+ *
+ * + *节点id + *+ */ + boolean hasSortId(); + /** + *
optional int32 sortId = 1;
+ *
+ * + *节点id + *+ */ + int getSortId(); + + // optional int32 lay = 2; + /** + *
optional int32 lay = 2;
+ *
+ * + *节点层 + *+ */ + boolean hasLay(); + /** + *
optional int32 lay = 2;
+ *
+ * + *节点层 + *+ */ + int getLay(); + + // optional int32 type = 3; + /** + *
optional int32 type = 3;
+ *
+ * + *节点类型 + *+ */ + boolean hasType(); + /** + *
optional int32 type = 3;
+ *
+ * + *节点类型 + *+ */ + int getType(); + + // optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + boolean hasBossTeaminfo(); + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo getBossTeaminfo(); + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder getBossTeaminfoOrBuilder(); + + // optional int32 state = 5; + /** + *
optional int32 state = 5;
+ *
+ * + *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 + *+ */ + boolean hasState(); + /** + *
optional int32 state = 5;
+ *
+ * + *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 + *+ */ + int getState(); + + // repeated int32 holyEquipID = 6; + /** + *
repeated int32 holyEquipID = 6;
+ *
+ * + *圣物id + *+ */ + java.util.List
repeated int32 holyEquipID = 6;
+ *
+ * + *圣物id + *+ */ + int getHolyEquipIDCount(); + /** + *
repeated int32 holyEquipID = 6;
+ *
+ * + *圣物id + *+ */ + int getHolyEquipID(int index); + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ExpeditionNodeInfo} + * + *
+ *猎妖之路节点信息 + *+ */ + public static final class ExpeditionNodeInfo extends + com.google.protobuf.GeneratedMessage + implements ExpeditionNodeInfoOrBuilder { + // Use ExpeditionNodeInfo.newBuilder() to construct. + private ExpeditionNodeInfo(com.google.protobuf.GeneratedMessage.Builder> builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private ExpeditionNodeInfo(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final ExpeditionNodeInfo defaultInstance; + public static ExpeditionNodeInfo getDefaultInstance() { + return defaultInstance; + } + + public ExpeditionNodeInfo getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ExpeditionNodeInfo( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + 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; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + sortId_ = input.readInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + lay_ = input.readInt32(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + type_ = input.readInt32(); + break; + } + case 34: { + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder subBuilder = null; + if (((bitField0_ & 0x00000008) == 0x00000008)) { + subBuilder = bossTeaminfo_.toBuilder(); + } + bossTeaminfo_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(bossTeaminfo_); + bossTeaminfo_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000008; + break; + } + case 40: { + bitField0_ |= 0x00000010; + state_ = input.readInt32(); + break; + } + case 48: { + if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + holyEquipID_ = new java.util.ArrayList
optional int32 sortId = 1;
+ *
+ * + *节点id + *+ */ + public boolean hasSortId() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + *
optional int32 sortId = 1;
+ *
+ * + *节点id + *+ */ + public int getSortId() { + return sortId_; + } + + // optional int32 lay = 2; + public static final int LAY_FIELD_NUMBER = 2; + private int lay_; + /** + *
optional int32 lay = 2;
+ *
+ * + *节点层 + *+ */ + public boolean hasLay() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + *
optional int32 lay = 2;
+ *
+ * + *节点层 + *+ */ + public int getLay() { + return lay_; + } + + // optional int32 type = 3; + public static final int TYPE_FIELD_NUMBER = 3; + private int type_; + /** + *
optional int32 type = 3;
+ *
+ * + *节点类型 + *+ */ + public boolean hasType() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + *
optional int32 type = 3;
+ *
+ * + *节点类型 + *+ */ + public int getType() { + return type_; + } + + // optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + public static final int BOSSTEAMINFO_FIELD_NUMBER = 4; + private com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo bossTeaminfo_; + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + public boolean hasBossTeaminfo() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo getBossTeaminfo() { + return bossTeaminfo_; + } + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder getBossTeaminfoOrBuilder() { + return bossTeaminfo_; + } + + // optional int32 state = 5; + public static final int STATE_FIELD_NUMBER = 5; + private int state_; + /** + *
optional int32 state = 5;
+ *
+ * + *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 + *+ */ + public boolean hasState() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + *
optional int32 state = 5;
+ *
+ * + *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 + *+ */ + public int getState() { + return state_; + } + + // repeated int32 holyEquipID = 6; + public static final int HOLYEQUIPID_FIELD_NUMBER = 6; + private java.util.List
repeated int32 holyEquipID = 6;
+ *
+ * + *圣物id + *+ */ + public java.util.List
repeated int32 holyEquipID = 6;
+ *
+ * + *圣物id + *+ */ + public int getHolyEquipIDCount() { + return holyEquipID_.size(); + } + /** + *
repeated int32 holyEquipID = 6;
+ *
+ * + *圣物id + *+ */ + public int getHolyEquipID(int index) { + return holyEquipID_.get(index); + } + + private void initFields() { + sortId_ = 0; + lay_ = 0; + type_ = 0; + bossTeaminfo_ = com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance(); + state_ = 0; + holyEquipID_ = java.util.Collections.emptyList(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeInt32(1, sortId_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(2, lay_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeInt32(3, type_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeMessage(4, bossTeaminfo_); + } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + output.writeInt32(5, state_); + } + for (int i = 0; i < holyEquipID_.size(); i++) { + output.writeInt32(6, holyEquipID_.get(i)); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, sortId_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, lay_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, type_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, bossTeaminfo_); + } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(5, state_); + } + { + int dataSize = 0; + for (int i = 0; i < holyEquipID_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(holyEquipID_.get(i)); + } + size += dataSize; + size += 1 * getHolyEquipIDList().size(); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ExpeditionNodeInfo} + * + *
+ *猎妖之路节点信息 + *+ */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder
optional int32 sortId = 1;
+ *
+ * + *节点id + *+ */ + public boolean hasSortId() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + *
optional int32 sortId = 1;
+ *
+ * + *节点id + *+ */ + public int getSortId() { + return sortId_; + } + /** + *
optional int32 sortId = 1;
+ *
+ * + *节点id + *+ */ + public Builder setSortId(int value) { + bitField0_ |= 0x00000001; + sortId_ = value; + onChanged(); + return this; + } + /** + *
optional int32 sortId = 1;
+ *
+ * + *节点id + *+ */ + public Builder clearSortId() { + bitField0_ = (bitField0_ & ~0x00000001); + sortId_ = 0; + onChanged(); + return this; + } + + // optional int32 lay = 2; + private int lay_ ; + /** + *
optional int32 lay = 2;
+ *
+ * + *节点层 + *+ */ + public boolean hasLay() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + *
optional int32 lay = 2;
+ *
+ * + *节点层 + *+ */ + public int getLay() { + return lay_; + } + /** + *
optional int32 lay = 2;
+ *
+ * + *节点层 + *+ */ + public Builder setLay(int value) { + bitField0_ |= 0x00000002; + lay_ = value; + onChanged(); + return this; + } + /** + *
optional int32 lay = 2;
+ *
+ * + *节点层 + *+ */ + public Builder clearLay() { + bitField0_ = (bitField0_ & ~0x00000002); + lay_ = 0; + onChanged(); + return this; + } + + // optional int32 type = 3; + private int type_ ; + /** + *
optional int32 type = 3;
+ *
+ * + *节点类型 + *+ */ + public boolean hasType() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + *
optional int32 type = 3;
+ *
+ * + *节点类型 + *+ */ + public int getType() { + return type_; + } + /** + *
optional int32 type = 3;
+ *
+ * + *节点类型 + *+ */ + public Builder setType(int value) { + bitField0_ |= 0x00000004; + type_ = value; + onChanged(); + return this; + } + /** + *
optional int32 type = 3;
+ *
+ * + *节点类型 + *+ */ + public Builder clearType() { + bitField0_ = (bitField0_ & ~0x00000004); + type_ = 0; + onChanged(); + return this; + } + + // optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + private com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo bossTeaminfo_ = com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder> bossTeaminfoBuilder_; + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + public boolean hasBossTeaminfo() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo getBossTeaminfo() { + if (bossTeaminfoBuilder_ == null) { + return bossTeaminfo_; + } else { + return bossTeaminfoBuilder_.getMessage(); + } + } + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + public Builder setBossTeaminfo(com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo value) { + if (bossTeaminfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + bossTeaminfo_ = value; + onChanged(); + } else { + bossTeaminfoBuilder_.setMessage(value); + } + bitField0_ |= 0x00000008; + return this; + } + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + public Builder setBossTeaminfo( + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder builderForValue) { + if (bossTeaminfoBuilder_ == null) { + bossTeaminfo_ = builderForValue.build(); + onChanged(); + } else { + bossTeaminfoBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000008; + return this; + } + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + public Builder mergeBossTeaminfo(com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo value) { + if (bossTeaminfoBuilder_ == null) { + if (((bitField0_ & 0x00000008) == 0x00000008) && + bossTeaminfo_ != com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance()) { + bossTeaminfo_ = + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.newBuilder(bossTeaminfo_).mergeFrom(value).buildPartial(); + } else { + bossTeaminfo_ = value; + } + onChanged(); + } else { + bossTeaminfoBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000008; + return this; + } + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + public Builder clearBossTeaminfo() { + if (bossTeaminfoBuilder_ == null) { + bossTeaminfo_ = com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance(); + onChanged(); + } else { + bossTeaminfoBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000008); + return this; + } + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder getBossTeaminfoBuilder() { + bitField0_ |= 0x00000008; + onChanged(); + return getBossTeaminfoFieldBuilder().getBuilder(); + } + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder getBossTeaminfoOrBuilder() { + if (bossTeaminfoBuilder_ != null) { + return bossTeaminfoBuilder_.getMessageOrBuilder(); + } else { + return bossTeaminfo_; + } + } + /** + *
optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4;
+ *
+ * + *节点队伍信息 + *+ */ + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder> + getBossTeaminfoFieldBuilder() { + if (bossTeaminfoBuilder_ == null) { + bossTeaminfoBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder>( + bossTeaminfo_, + getParentForChildren(), + isClean()); + bossTeaminfo_ = null; + } + return bossTeaminfoBuilder_; + } + + // optional int32 state = 5; + private int state_ ; + /** + *
optional int32 state = 5;
+ *
+ * + *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 + *+ */ + public boolean hasState() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + *
optional int32 state = 5;
+ *
+ * + *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 + *+ */ + public int getState() { + return state_; + } + /** + *
optional int32 state = 5;
+ *
+ * + *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 + *+ */ + public Builder setState(int value) { + bitField0_ |= 0x00000010; + state_ = value; + onChanged(); + return this; + } + /** + *
optional int32 state = 5;
+ *
+ * + *//节点状态 0未开启 1未通过 2未领取圣物 3已完成 + *+ */ + public Builder clearState() { + bitField0_ = (bitField0_ & ~0x00000010); + state_ = 0; + onChanged(); + return this; + } + + // repeated int32 holyEquipID = 6; + private java.util.List
repeated int32 holyEquipID = 6;
+ *
+ * + *圣物id + *+ */ + public java.util.List
repeated int32 holyEquipID = 6;
+ *
+ * + *圣物id + *+ */ + public int getHolyEquipIDCount() { + return holyEquipID_.size(); + } + /** + *
repeated int32 holyEquipID = 6;
+ *
+ * + *圣物id + *+ */ + public int getHolyEquipID(int index) { + return holyEquipID_.get(index); + } + /** + *
repeated int32 holyEquipID = 6;
+ *
+ * + *圣物id + *+ */ + public Builder setHolyEquipID( + int index, int value) { + ensureHolyEquipIDIsMutable(); + holyEquipID_.set(index, value); + onChanged(); + return this; + } + /** + *
repeated int32 holyEquipID = 6;
+ *
+ * + *圣物id + *+ */ + public Builder addHolyEquipID(int value) { + ensureHolyEquipIDIsMutable(); + holyEquipID_.add(value); + onChanged(); + return this; + } + /** + *
repeated int32 holyEquipID = 6;
+ *
+ * + *圣物id + *+ */ + public Builder addAllHolyEquipID( + java.lang.Iterable extends java.lang.Integer> values) { + ensureHolyEquipIDIsMutable(); + super.addAll(values, holyEquipID_); + onChanged(); + return this; + } + /** + *
repeated int32 holyEquipID = 6;
+ *
+ * + *圣物id + *+ */ + public Builder clearHolyEquipID() { + holyEquipID_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000020); + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ExpeditionNodeInfo) + } + + static { + defaultInstance = new ExpeditionNodeInfo(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ExpeditionNodeInfo) + } + public interface ExpeditionSimpleHeroInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { @@ -88652,11 +88878,6 @@ public final class CommonProto { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_com_ljsd_jieling_protocols_RedOneDetail_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleBossInfo_descriptor; private static @@ -88667,6 +88888,11 @@ public final class CommonProto { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_com_ljsd_jieling_protocols_ExpeditionTeamInfo_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_descriptor; private static @@ -88927,24 +89153,25 @@ public final class CommonProto { "om.ljsd.jieling.protocols.TeamOneInfo\022\023\n" + "\013fightResult\030\003 \001(\005\022\n\n\002id\030\004 \001(\t\022\022\n\nroundT" + "Imes\030\005 \001(\005\022\016\n\006teamId\030\006 \001(\005\022\020\n\010position\030\007" + - " \001(\005\022\017\n\007isGUess\030\010 \001(\005\"_\n\nRedPackage\022\020\n\010u" + + " \001(\005\022\017\n\007isGUess\030\010 \001(\005\"q\n\nRedPackage\022\020\n\010u" + "serName\030\001 \001(\t\022\r\n\005redId\030\002 \001(\005\022\r\n\005isGet\030\003 " + - "\001(\005\022\020\n\010getCount\030\004 \001(\005\022\017\n\007redType\030\005 \001(\005\"w" + - "\n\014RedOneDetail\022\013\n\003uid\030\001 \001(\005\022\014\n\004head\030\002 \001(", - "\005\022\021\n\theadFrame\030\003 \001(\005\022\014\n\004name\030\004 \001(\t\022\014\n\004ti" + - "me\030\005 \001(\005\022\r\n\005count\030\006 \001(\005\022\016\n\006itemId\030\007 \001(\005\"" + - "\251\001\n\022ExpeditionNodeInfo\022\016\n\006sortId\030\001 \001(\005\022\013" + - "\n\003lay\030\002 \001(\005\022\014\n\004type\030\003 \001(\005\022D\n\014bossTeaminf" + - "o\030\004 \001(\0132..com.ljsd.jieling.protocols.Exp" + - "editionTeamInfo\022\r\n\005state\030\005 \001(\005\022\023\n\013holyEq" + - "uipID\030\006 \003(\005\"Z\n\030ExpeditionSimpleBossInfo\022" + - "\017\n\007heroTid\030\001 \001(\005\022\014\n\004star\030\002 \001(\005\022\r\n\005level\030" + - "\003 \001(\005\022\020\n\010remainHp\030\004 \001(\001\"\202\001\n\022ExpeditionTe" + - "amInfo\022B\n\004hero\030\001 \003(\01324.com.ljsd.jieling.", - "protocols.ExpeditionSimpleBossInfo\022\024\n\014Po" + - "kemonInfos\030\002 \003(\005\022\022\n\ntotalForce\030\003 \001(\005\"<\n\030" + - "ExpeditionSimpleHeroInfo\022\016\n\006heroId\030\001 \001(\t" + - "\022\020\n\010remainHp\030\002 \001(\001B\002H\001" + "\001(\005\022\020\n\010getCount\030\004 \001(\005\022\017\n\007redType\030\005 \001(\005\022\020" + + "\n\010sendTime\030\006 \001(\005\"\211\001\n\014RedOneDetail\022\013\n\003uid", + "\030\001 \001(\005\022\014\n\004head\030\002 \001(\005\022\021\n\theadFrame\030\003 \001(\005\022" + + "\014\n\004name\030\004 \001(\t\022\014\n\004time\030\005 \001(\005\022\r\n\005count\030\006 \001" + + "(\005\022\016\n\006itemId\030\007 \001(\005\022\020\n\010position\030\010 \001(\005\"Z\n\030" + + "ExpeditionSimpleBossInfo\022\017\n\007heroTid\030\001 \001(" + + "\005\022\014\n\004star\030\002 \001(\005\022\r\n\005level\030\003 \001(\005\022\020\n\010remain" + + "Hp\030\004 \001(\001\"\202\001\n\022ExpeditionTeamInfo\022B\n\004hero\030" + + "\001 \003(\01324.com.ljsd.jieling.protocols.Exped" + + "itionSimpleBossInfo\022\024\n\014PokemonInfos\030\002 \003(" + + "\005\022\022\n\ntotalForce\030\003 \001(\005\"\251\001\n\022ExpeditionNode" + + "Info\022\016\n\006sortId\030\001 \001(\005\022\013\n\003lay\030\002 \001(\005\022\014\n\004typ", + "e\030\003 \001(\005\022D\n\014bossTeaminfo\030\004 \001(\0132..com.ljsd" + + ".jieling.protocols.ExpeditionTeamInfo\022\r\n" + + "\005state\030\005 \001(\005\022\023\n\013holyEquipID\030\006 \003(\005\"<\n\030Exp" + + "editionSimpleHeroInfo\022\016\n\006heroId\030\001 \001(\t\022\020\n" + + "\010remainHp\030\002 \001(\001B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -89496,31 +89723,31 @@ public final class CommonProto { internal_static_com_ljsd_jieling_protocols_RedPackage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_RedPackage_descriptor, - new java.lang.String[] { "UserName", "RedId", "IsGet", "GetCount", "RedType", }); + new java.lang.String[] { "UserName", "RedId", "IsGet", "GetCount", "RedType", "SendTime", }); internal_static_com_ljsd_jieling_protocols_RedOneDetail_descriptor = getDescriptor().getMessageTypes().get(90); internal_static_com_ljsd_jieling_protocols_RedOneDetail_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_RedOneDetail_descriptor, - new java.lang.String[] { "Uid", "Head", "HeadFrame", "Name", "Time", "Count", "ItemId", }); - internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_descriptor = - getDescriptor().getMessageTypes().get(91); - internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_descriptor, - new java.lang.String[] { "SortId", "Lay", "Type", "BossTeaminfo", "State", "HolyEquipID", }); + new java.lang.String[] { "Uid", "Head", "HeadFrame", "Name", "Time", "Count", "ItemId", "Position", }); internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleBossInfo_descriptor = - getDescriptor().getMessageTypes().get(92); + getDescriptor().getMessageTypes().get(91); internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleBossInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleBossInfo_descriptor, new java.lang.String[] { "HeroTid", "Star", "Level", "RemainHp", }); internal_static_com_ljsd_jieling_protocols_ExpeditionTeamInfo_descriptor = - getDescriptor().getMessageTypes().get(93); + getDescriptor().getMessageTypes().get(92); internal_static_com_ljsd_jieling_protocols_ExpeditionTeamInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_ExpeditionTeamInfo_descriptor, new java.lang.String[] { "Hero", "PokemonInfos", "TotalForce", }); + internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_descriptor = + getDescriptor().getMessageTypes().get(93); + internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_descriptor, + new java.lang.String[] { "SortId", "Lay", "Type", "BossTeaminfo", "State", "HolyEquipID", }); internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_descriptor = getDescriptor().getMessageTypes().get(94); internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_fieldAccessorTable = new diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index f71bd5dcb..b85a95edc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -354,7 +354,7 @@ public class GlobalDataManaager implements IManager { public static void flushGoodsTimes(User user){ Map