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 fba1f635b..865798c83 100644
--- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java
+++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java
@@ -7306,9 +7306,9 @@ public final class CommonProto {
public interface SoulPosOrBuilder
extends com.google.protobuf.MessageOrBuilder {
- // optional string equipId = 1;
+ // optional int32 equipId = 1;
/**
- * optional string equipId = 1;
+ * optional int32 equipId = 1;
*
*
*装备id @@ -7316,22 +7316,13 @@ public final class CommonProto { */ boolean hasEquipId(); /** - **/ - TO_BE_STRONGER_REQUEST(440, 11914), + TO_BE_STRONGER_REQUEST(442, 11914), /** *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id **/ - java.lang.String getEquipId(); - /** - *optional string equipId = 1;
- * - *- *装备id - *- */ - com.google.protobuf.ByteString - getEquipIdBytes(); + int getEquipId(); // optional int32 position = 2; /** @@ -7402,9 +7393,9 @@ public final class CommonProto { } break; } - case 10: { + case 8: { bitField0_ |= 0x00000001; - equipId_ = input.readBytes(); + equipId_ = input.readInt32(); break; } case 16: { @@ -7452,11 +7443,11 @@ public final class CommonProto { } private int bitField0_; - // optional string equipId = 1; + // optional int32 equipId = 1; public static final int EQUIPID_FIELD_NUMBER = 1; - private java.lang.Object equipId_; + private int equipId_; /** - *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id @@ -7466,45 +7457,14 @@ public final class CommonProto { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - **/ - TAKE_SEVEN_HAPPY_REWARD_REQUEST(438, 11912), + TAKE_SEVEN_HAPPY_REWARD_REQUEST(440, 11912), /** *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id **/ - public java.lang.String getEquipId() { - java.lang.Object ref = equipId_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - equipId_ = s; - } - return s; - } - } - /** - *optional string equipId = 1;
- * - *- *装备id - *- */ - public com.google.protobuf.ByteString - getEquipIdBytes() { - java.lang.Object ref = equipId_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - equipId_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public int getEquipId() { + return equipId_; } // optional int32 position = 2; @@ -7532,7 +7492,7 @@ public final class CommonProto { } private void initFields() { - equipId_ = ""; + equipId_ = 0; position_ = 0; } private byte memoizedIsInitialized = -1; @@ -7548,7 +7508,7 @@ public final class CommonProto { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getEquipIdBytes()); + output.writeInt32(1, equipId_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeInt32(2, position_); @@ -7564,7 +7524,7 @@ public final class CommonProto { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getEquipIdBytes()); + .computeInt32Size(1, equipId_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream @@ -7686,7 +7646,7 @@ public final class CommonProto { public Builder clear() { super.clear(); - equipId_ = ""; + equipId_ = 0; bitField0_ = (bitField0_ & ~0x00000001); position_ = 0; bitField0_ = (bitField0_ & ~0x00000002); @@ -7743,9 +7703,7 @@ public final class CommonProto { public Builder mergeFrom(com.ljsd.jieling.protocols.CommonProto.SoulPos other) { if (other == com.ljsd.jieling.protocols.CommonProto.SoulPos.getDefaultInstance()) return this; if (other.hasEquipId()) { - bitField0_ |= 0x00000001; - equipId_ = other.equipId_; - onChanged(); + setEquipId(other.getEquipId()); } if (other.hasPosition()) { setPosition(other.getPosition()); @@ -7777,10 +7735,10 @@ public final class CommonProto { } private int bitField0_; - // optional string equipId = 1; - private java.lang.Object equipId_ = ""; + // optional int32 equipId = 1; + private int equipId_ ; /** - *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id @@ -7790,62 +7748,30 @@ public final class CommonProto { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - **/ - TAKE_TOWER_REWARD_REQUEST(436, 11910), + TAKE_TOWER_REWARD_REQUEST(438, 11910), /** *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id **/ - public java.lang.String getEquipId() { - java.lang.Object ref = equipId_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - equipId_ = s; - return s; - } else { - return (java.lang.String) ref; - } + public int getEquipId() { + return equipId_; } /** - *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id **/ - public com.google.protobuf.ByteString - getEquipIdBytes() { - java.lang.Object ref = equipId_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - equipId_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - *optional string equipId = 1;
- * - *- *装备id - *- */ - public Builder setEquipId( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + public Builder setEquipId(int value) { + bitField0_ |= 0x00000001; equipId_ = value; onChanged(); return this; } /** - *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id @@ -7853,24 +7779,7 @@ public final class CommonProto { */ public Builder clearEquipId() { bitField0_ = (bitField0_ & ~0x00000001); - equipId_ = getDefaultInstance().getEquipId(); - onChanged(); - return this; - } - /** - **/ - TEST_BUY_GIGT_GOODS_REQEUST(434, 11908), + TEST_BUY_GIGT_GOODS_REQEUST(436, 11908), /** *optional string equipId = 1;
- * - *- *装备id - *- */ - public Builder setEquipIdBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - equipId_ = value; + equipId_ = 0; onChanged(); return this; } @@ -89665,7 +89574,7 @@ public final class CommonProto { "sd.jieling.protocols.SpecialEffects\022\024\n\014r" + "ebuildLevel\030\005 \001(\005\022\022\n\ncreateTime\030\006 \001(\005\022\017\n" + "\007skillId\030\007 \001(\005\022\020\n\010isLocked\030\010 \001(\005\022\013\n\003exp\030" + - "\t \001(\005\",\n\007SoulPos\022\017\n\007equipId\030\001 \001(\t\022\020\n\010pos" + + "\t \001(\005\",\n\007SoulPos\022\017\n\007equipId\030\001 \001(\005\022\020\n\010pos" + "ition\030\002 \001(\005\"\203\002\n\004Hero\022\n\n\002id\030\001 \001(\t\022\016\n\006hero" + "Id\030\002 \001(\005\022\r\n\005level\030\003 \001(\005\022\017\n\007breakId\030\004 \001(\005" + "\022\014\n\004star\030\005 \001(\005\022\016\n\006skinId\030\006 \001(\005\022\023\n\013equipI", diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/HeroInfoProto.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/HeroInfoProto.java index 5d7188c91..474eef05e 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/HeroInfoProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/HeroInfoProto.java @@ -10529,9 +10529,9 @@ public final class HeroInfoProto { public interface SoulEquipPosOrBuilder extends com.google.protobuf.MessageOrBuilder { - // optional string equipId = 1; + // optional int32 equipId = 1; /** - *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id @@ -10539,22 +10539,13 @@ public final class HeroInfoProto { */ boolean hasEquipId(); /** - **/ - TAKE_MISSION_REWARD_REQUEST(432, 11906), + TAKE_MISSION_REWARD_REQUEST(434, 11906), /** *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id **/ - java.lang.String getEquipId(); - /** - *optional string equipId = 1;
- * - *- *装备id - *- */ - com.google.protobuf.ByteString - getEquipIdBytes(); + int getEquipId(); // optional int32 position = 2; /** @@ -10625,9 +10616,9 @@ public final class HeroInfoProto { } break; } - case 10: { + case 8: { bitField0_ |= 0x00000001; - equipId_ = input.readBytes(); + equipId_ = input.readInt32(); break; } case 16: { @@ -10675,11 +10666,11 @@ public final class HeroInfoProto { } private int bitField0_; - // optional string equipId = 1; + // optional int32 equipId = 1; public static final int EQUIPID_FIELD_NUMBER = 1; - private java.lang.Object equipId_; + private int equipId_; /** - *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id @@ -10689,45 +10680,14 @@ public final class HeroInfoProto { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - **/ - TAKE_ACTIVITY_REWARD_REQUEST(430, 11904), + TAKE_ACTIVITY_REWARD_REQUEST(432, 11904), /** *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id **/ - public java.lang.String getEquipId() { - java.lang.Object ref = equipId_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - equipId_ = s; - } - return s; - } - } - /** - *optional string equipId = 1;
- * - *- *装备id - *- */ - public com.google.protobuf.ByteString - getEquipIdBytes() { - java.lang.Object ref = equipId_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - equipId_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public int getEquipId() { + return equipId_; } // optional int32 position = 2; @@ -10755,7 +10715,7 @@ public final class HeroInfoProto { } private void initFields() { - equipId_ = ""; + equipId_ = 0; position_ = 0; } private byte memoizedIsInitialized = -1; @@ -10771,7 +10731,7 @@ public final class HeroInfoProto { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getEquipIdBytes()); + output.writeInt32(1, equipId_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeInt32(2, position_); @@ -10787,7 +10747,7 @@ public final class HeroInfoProto { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getEquipIdBytes()); + .computeInt32Size(1, equipId_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream @@ -10909,7 +10869,7 @@ public final class HeroInfoProto { public Builder clear() { super.clear(); - equipId_ = ""; + equipId_ = 0; bitField0_ = (bitField0_ & ~0x00000001); position_ = 0; bitField0_ = (bitField0_ & ~0x00000002); @@ -10966,9 +10926,7 @@ public final class HeroInfoProto { public Builder mergeFrom(com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipPos other) { if (other == com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipPos.getDefaultInstance()) return this; if (other.hasEquipId()) { - bitField0_ |= 0x00000001; - equipId_ = other.equipId_; - onChanged(); + setEquipId(other.getEquipId()); } if (other.hasPosition()) { setPosition(other.getPosition()); @@ -11000,10 +10958,10 @@ public final class HeroInfoProto { } private int bitField0_; - // optional string equipId = 1; - private java.lang.Object equipId_ = ""; + // optional int32 equipId = 1; + private int equipId_ ; /** - *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id @@ -11013,62 +10971,30 @@ public final class HeroInfoProto { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - **/ - TEAM_POS_SAVE_REQUEST(428, 11902), + TEAM_POS_SAVE_REQUEST(430, 11902), /** *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id **/ - public java.lang.String getEquipId() { - java.lang.Object ref = equipId_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - equipId_ = s; - return s; - } else { - return (java.lang.String) ref; - } + public int getEquipId() { + return equipId_; } /** - *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id **/ - public com.google.protobuf.ByteString - getEquipIdBytes() { - java.lang.Object ref = equipId_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - equipId_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - *optional string equipId = 1;
- * - *- *装备id - *- */ - public Builder setEquipId( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + public Builder setEquipId(int value) { + bitField0_ |= 0x00000001; equipId_ = value; onChanged(); return this; } /** - *optional string equipId = 1;
+ *optional int32 equipId = 1;
* **装备id @@ -11076,24 +11002,7 @@ public final class HeroInfoProto { */ public Builder clearEquipId() { bitField0_ = (bitField0_ & ~0x00000001); - equipId_ = getDefaultInstance().getEquipId(); - onChanged(); - return this; - } - /** - **/ - TRIGGER_EVENT_REQUEST(426, 11900), + TRIGGER_EVENT_REQUEST(428, 11900), /** *optional string equipId = 1;
- * - *- *装备id - *- */ - public Builder setEquipIdBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - equipId_ = value; + equipId_ = 0; onChanged(); return this; } @@ -11158,7 +11067,644 @@ public final class HeroInfoProto { // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.SoulEquipPos) } - public interface SoulEquipWearRequestOrBuilder + public interface MergeSoulRequestOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional int32 targetId = 1; + /** + *optional int32 targetId = 1;
+ * + *+ *目标合成物 + *+ */ + boolean hasTargetId(); + /** + *optional int32 targetId = 1;
+ * + *+ *目标合成物 + *+ */ + int getTargetId(); + + // repeated int32 soulId = 2; + /** + *repeated int32 soulId = 2;
+ * + *+ *消耗的魂印 + *+ */ + java.util.ListgetSoulIdList(); + /** + * repeated int32 soulId = 2;
+ * + *+ *消耗的魂印 + *+ */ + int getSoulIdCount(); + /** + *repeated int32 soulId = 2;
+ * + *+ *消耗的魂印 + *+ */ + int getSoulId(int index); + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.MergeSoulRequest} + */ + public static final class MergeSoulRequest extends + com.google.protobuf.GeneratedMessage + implements MergeSoulRequestOrBuilder { + // Use MergeSoulRequest.newBuilder() to construct. + private MergeSoulRequest(com.google.protobuf.GeneratedMessage.Builder> builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private MergeSoulRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final MergeSoulRequest defaultInstance; + public static MergeSoulRequest getDefaultInstance() { + return defaultInstance; + } + + public MergeSoulRequest getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private MergeSoulRequest( + 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; + targetId_ = input.readInt32(); + break; + } + case 16: { + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + soulId_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + soulId_.add(input.readInt32()); + break; + } + case 18: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) && input.getBytesUntilLimit() > 0) { + soulId_ = new java.util.ArrayList (); + mutable_bitField0_ |= 0x00000002; + } + while (input.getBytesUntilLimit() > 0) { + soulId_.add(input.readInt32()); + } + input.popLimit(limit); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + soulId_ = java.util.Collections.unmodifiableList(soulId_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_MergeSoulRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_MergeSoulRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest.class, com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser () { + public MergeSoulRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new MergeSoulRequest(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional int32 targetId = 1; + public static final int TARGETID_FIELD_NUMBER = 1; + private int targetId_; + /** + * optional int32 targetId = 1;
+ * + *+ *目标合成物 + *+ */ + public boolean hasTargetId() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + *optional int32 targetId = 1;
+ * + *+ *目标合成物 + *+ */ + public int getTargetId() { + return targetId_; + } + + // repeated int32 soulId = 2; + public static final int SOULID_FIELD_NUMBER = 2; + private java.util.ListsoulId_; + /** + * repeated int32 soulId = 2;
+ * + *+ *消耗的魂印 + *+ */ + public java.util.List+ getSoulIdList() { + return soulId_; + } + /** + * repeated int32 soulId = 2;
+ * + *+ *消耗的魂印 + *+ */ + public int getSoulIdCount() { + return soulId_.size(); + } + /** + *repeated int32 soulId = 2;
+ * + *+ *消耗的魂印 + *+ */ + public int getSoulId(int index) { + return soulId_.get(index); + } + + private void initFields() { + targetId_ = 0; + soulId_ = 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, targetId_); + } + for (int i = 0; i < soulId_.size(); i++) { + output.writeInt32(2, soulId_.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, targetId_); + } + { + int dataSize = 0; + for (int i = 0; i < soulId_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(soulId_.get(i)); + } + size += dataSize; + size += 1 * getSoulIdList().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.HeroInfoProto.MergeSoulRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest 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.HeroInfoProto.MergeSoulRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest 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.HeroInfoProto.MergeSoulRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest 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.HeroInfoProto.MergeSoulRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest 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.HeroInfoProto.MergeSoulRequest 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.MergeSoulRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder+ implements com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_MergeSoulRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_MergeSoulRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest.class, com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest.Builder.class); + } + + // Construct using com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + targetId_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + soulId_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_MergeSoulRequest_descriptor; + } + + public com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest.getDefaultInstance(); + } + + public com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest build() { + com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest buildPartial() { + com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest result = new com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.targetId_ = targetId_; + if (((bitField0_ & 0x00000002) == 0x00000002)) { + soulId_ = java.util.Collections.unmodifiableList(soulId_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.soulId_ = soulId_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest) { + return mergeFrom((com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest other) { + if (other == com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest.getDefaultInstance()) return this; + if (other.hasTargetId()) { + setTargetId(other.getTargetId()); + } + if (!other.soulId_.isEmpty()) { + if (soulId_.isEmpty()) { + soulId_ = other.soulId_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureSoulIdIsMutable(); + soulId_.addAll(other.soulId_); + } + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulRequest) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional int32 targetId = 1; + private int targetId_ ; + /** + * optional int32 targetId = 1;
+ * + *+ *目标合成物 + *+ */ + public boolean hasTargetId() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + *optional int32 targetId = 1;
+ * + *+ *目标合成物 + *+ */ + public int getTargetId() { + return targetId_; + } + /** + *optional int32 targetId = 1;
+ * + *+ *目标合成物 + *+ */ + public Builder setTargetId(int value) { + bitField0_ |= 0x00000001; + targetId_ = value; + onChanged(); + return this; + } + /** + *optional int32 targetId = 1;
+ * + *+ *目标合成物 + *+ */ + public Builder clearTargetId() { + bitField0_ = (bitField0_ & ~0x00000001); + targetId_ = 0; + onChanged(); + return this; + } + + // repeated int32 soulId = 2; + private java.util.ListsoulId_ = java.util.Collections.emptyList(); + private void ensureSoulIdIsMutable() { + if (!((bitField0_ & 0x00000002) == 0x00000002)) { + soulId_ = new java.util.ArrayList (soulId_); + bitField0_ |= 0x00000002; + } + } + /** + * repeated int32 soulId = 2;
+ * + *+ *消耗的魂印 + *+ */ + public java.util.List+ getSoulIdList() { + return java.util.Collections.unmodifiableList(soulId_); + } + /** + * repeated int32 soulId = 2;
+ * + *+ *消耗的魂印 + *+ */ + public int getSoulIdCount() { + return soulId_.size(); + } + /** + *repeated int32 soulId = 2;
+ * + *+ *消耗的魂印 + *+ */ + public int getSoulId(int index) { + return soulId_.get(index); + } + /** + *repeated int32 soulId = 2;
+ * + *+ *消耗的魂印 + *+ */ + public Builder setSoulId( + int index, int value) { + ensureSoulIdIsMutable(); + soulId_.set(index, value); + onChanged(); + return this; + } + /** + *repeated int32 soulId = 2;
+ * + *+ *消耗的魂印 + *+ */ + public Builder addSoulId(int value) { + ensureSoulIdIsMutable(); + soulId_.add(value); + onChanged(); + return this; + } + /** + *repeated int32 soulId = 2;
+ * + *+ *消耗的魂印 + *+ */ + public Builder addAllSoulId( + java.lang.Iterable extends java.lang.Integer> values) { + ensureSoulIdIsMutable(); + super.addAll(values, soulId_); + onChanged(); + return this; + } + /** + *repeated int32 soulId = 2;
+ * + *+ *消耗的魂印 + *+ */ + public Builder clearSoulId() { + soulId_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.MergeSoulRequest) + } + + static { + defaultInstance = new MergeSoulRequest(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.MergeSoulRequest) + } + + public interface OptHeroSoulOrBuilder extends com.google.protobuf.MessageOrBuilder { // optional string heroId = 1; @@ -11232,44 +11778,26 @@ public final class HeroInfoProto { */ com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipPosOrBuilder getSoulEquipIdsOrBuilder( int index); - - // optional int32 type = 3; - /** - *optional int32 type = 3;
- * - *- *1 一键装备 - *- */ - boolean hasType(); - /** - *optional int32 type = 3;
- * - *- *1 一键装备 - *- */ - int getType(); } /** - * Protobuf type {@code com.ljsd.jieling.protocols.SoulEquipWearRequest} + * Protobuf type {@code com.ljsd.jieling.protocols.OptHeroSoul} */ - public static final class SoulEquipWearRequest extends + public static final class OptHeroSoul extends com.google.protobuf.GeneratedMessage - implements SoulEquipWearRequestOrBuilder { - // Use SoulEquipWearRequest.newBuilder() to construct. - private SoulEquipWearRequest(com.google.protobuf.GeneratedMessage.Builder> builder) { + implements OptHeroSoulOrBuilder { + // Use OptHeroSoul.newBuilder() to construct. + private OptHeroSoul(com.google.protobuf.GeneratedMessage.Builder> builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - private SoulEquipWearRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + private OptHeroSoul(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - private static final SoulEquipWearRequest defaultInstance; - public static SoulEquipWearRequest getDefaultInstance() { + private static final OptHeroSoul defaultInstance; + public static OptHeroSoul getDefaultInstance() { return defaultInstance; } - public SoulEquipWearRequest getDefaultInstanceForType() { + public OptHeroSoul getDefaultInstanceForType() { return defaultInstance; } @@ -11279,7 +11807,7 @@ public final class HeroInfoProto { getUnknownFields() { return this.unknownFields; } - private SoulEquipWearRequest( + private OptHeroSoul( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -11315,11 +11843,6 @@ public final class HeroInfoProto { soulEquipIds_.add(input.readMessage(com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipPos.PARSER, extensionRegistry)); break; } - case 24: { - bitField0_ |= 0x00000002; - type_ = input.readInt32(); - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -11337,28 +11860,28 @@ public final class HeroInfoProto { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_descriptor; + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_OptHeroSoul_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_fieldAccessorTable + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_OptHeroSoul_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest.class, com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest.Builder.class); + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.class, com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.Builder.class); } - public static com.google.protobuf.ParserPARSER = - new com.google.protobuf.AbstractParser () { - public SoulEquipWearRequest parsePartialFrom( + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser () { + public OptHeroSoul parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SoulEquipWearRequest(input, extensionRegistry); + return new OptHeroSoul(input, extensionRegistry); } }; @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @@ -11474,34 +11997,9 @@ public final class HeroInfoProto { return soulEquipIds_.get(index); } - // optional int32 type = 3; - public static final int TYPE_FIELD_NUMBER = 3; - private int type_; - /** - * optional int32 type = 3;
- * - *- *1 一键装备 - *- */ - public boolean hasType() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - *optional int32 type = 3;
- * - *- *1 一键装备 - *- */ - public int getType() { - return type_; - } - private void initFields() { heroId_ = ""; soulEquipIds_ = java.util.Collections.emptyList(); - type_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -11521,9 +12019,6 @@ public final class HeroInfoProto { for (int i = 0; i < soulEquipIds_.size(); i++) { output.writeMessage(2, soulEquipIds_.get(i)); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeInt32(3, type_); - } getUnknownFields().writeTo(output); } @@ -11541,10 +12036,6 @@ public final class HeroInfoProto { size += com.google.protobuf.CodedOutputStream .computeMessageSize(2, soulEquipIds_.get(i)); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(3, type_); - } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -11557,53 +12048,53 @@ public final class HeroInfoProto { return super.writeReplace(); } - public static com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest parseFrom( + public static com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest parseFrom( + public static com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul 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.HeroInfoProto.SoulEquipWearRequest parseFrom(byte[] data) + public static com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest parseFrom( + public static com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest parseFrom(java.io.InputStream input) + public static com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest parseFrom( + public static com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul 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.HeroInfoProto.SoulEquipWearRequest parseDelimitedFrom(java.io.InputStream input) + public static com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest parseDelimitedFrom( + public static com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul 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.HeroInfoProto.SoulEquipWearRequest parseFrom( + public static com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest parseFrom( + public static com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -11612,7 +12103,7 @@ public final class HeroInfoProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest prototype) { + public static Builder newBuilder(com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -11624,24 +12115,24 @@ public final class HeroInfoProto { return builder; } /** - * Protobuf type {@code com.ljsd.jieling.protocols.SoulEquipWearRequest} + * Protobuf type {@code com.ljsd.jieling.protocols.OptHeroSoul} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder- implements com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequestOrBuilder { + implements com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoulOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_descriptor; + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_OptHeroSoul_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_fieldAccessorTable + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_OptHeroSoul_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest.class, com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest.Builder.class); + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.class, com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.Builder.class); } - // Construct using com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest.newBuilder() + // Construct using com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -11670,8 +12161,6 @@ public final class HeroInfoProto { } else { soulEquipIdsBuilder_.clear(); } - type_ = 0; - bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -11681,23 +12170,23 @@ public final class HeroInfoProto { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_descriptor; + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_OptHeroSoul_descriptor; } - public com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest getDefaultInstanceForType() { - return com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest.getDefaultInstance(); + public com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.getDefaultInstance(); } - public com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest build() { - com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest result = buildPartial(); + public com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul build() { + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest buildPartial() { - com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest result = new com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest(this); + public com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul buildPartial() { + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul result = new com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -11713,26 +12202,22 @@ public final class HeroInfoProto { } else { result.soulEquipIds_ = soulEquipIdsBuilder_.build(); } - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000002; - } - result.type_ = type_; result.bitField0_ = to_bitField0_; onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest) { - return mergeFrom((com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest)other); + if (other instanceof com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul) { + return mergeFrom((com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest other) { - if (other == com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest.getDefaultInstance()) return this; + public Builder mergeFrom(com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul other) { + if (other == com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.getDefaultInstance()) return this; if (other.hasHeroId()) { bitField0_ |= 0x00000001; heroId_ = other.heroId_; @@ -11764,9 +12249,6 @@ public final class HeroInfoProto { } } } - if (other.hasType()) { - setType(other.getType()); - } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -11779,11 +12261,11 @@ public final class HeroInfoProto { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest parsedMessage = null; + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest) e.getUnfinishedMessage(); + parsedMessage = (com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -12204,54 +12686,704 @@ public final class HeroInfoProto { return soulEquipIdsBuilder_; } - // optional int32 type = 3; - private int type_ ; + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.OptHeroSoul) + } + + static { + defaultInstance = new OptHeroSoul(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.OptHeroSoul) + } + + public interface SoulEquipWearRequestOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1; + /** + * optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
+ */ + boolean hasWearInfo(); + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
+ */ + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul getWearInfo(); + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
+ */ + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoulOrBuilder getWearInfoOrBuilder(); + + // optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2; + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + boolean hasUnloadInfo(); + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul getUnloadInfo(); + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoulOrBuilder getUnloadInfoOrBuilder(); + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.SoulEquipWearRequest} + */ + public static final class SoulEquipWearRequest extends + com.google.protobuf.GeneratedMessage + implements SoulEquipWearRequestOrBuilder { + // Use SoulEquipWearRequest.newBuilder() to construct. + private SoulEquipWearRequest(com.google.protobuf.GeneratedMessage.Builder> builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private SoulEquipWearRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final SoulEquipWearRequest defaultInstance; + public static SoulEquipWearRequest getDefaultInstance() { + return defaultInstance; + } + + public SoulEquipWearRequest getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private SoulEquipWearRequest( + 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 10: { + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = wearInfo_.toBuilder(); + } + wearInfo_ = input.readMessage(com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(wearInfo_); + wearInfo_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + case 18: { + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.Builder subBuilder = null; + if (((bitField0_ & 0x00000002) == 0x00000002)) { + subBuilder = unloadInfo_.toBuilder(); + } + unloadInfo_ = input.readMessage(com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(unloadInfo_); + unloadInfo_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000002; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest.class, com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest.Builder.class); + } + + public static com.google.protobuf.ParserPARSER = + new com.google.protobuf.AbstractParser () { + public SoulEquipWearRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new SoulEquipWearRequest(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1; + public static final int WEARINFO_FIELD_NUMBER = 1; + private com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul wearInfo_; + /** + * optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
+ */ + public boolean hasWearInfo() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
+ */ + public com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul getWearInfo() { + return wearInfo_; + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
+ */ + public com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoulOrBuilder getWearInfoOrBuilder() { + return wearInfo_; + } + + // optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2; + public static final int UNLOADINFO_FIELD_NUMBER = 2; + private com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul unloadInfo_; + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + public boolean hasUnloadInfo() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + public com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul getUnloadInfo() { + return unloadInfo_; + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + public com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoulOrBuilder getUnloadInfoOrBuilder() { + return unloadInfo_; + } + + private void initFields() { + wearInfo_ = com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.getDefaultInstance(); + unloadInfo_ = com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.getDefaultInstance(); + } + 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.writeMessage(1, wearInfo_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeMessage(2, unloadInfo_); + } + 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 + .computeMessageSize(1, wearInfo_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, unloadInfo_); + } + 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.HeroInfoProto.SoulEquipWearRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest 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.HeroInfoProto.SoulEquipWearRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest 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.HeroInfoProto.SoulEquipWearRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest 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.HeroInfoProto.SoulEquipWearRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest 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.HeroInfoProto.SoulEquipWearRequest 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.SoulEquipWearRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder+ implements com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest.class, com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest.Builder.class); + } + + // Construct using com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getWearInfoFieldBuilder(); + getUnloadInfoFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + if (wearInfoBuilder_ == null) { + wearInfo_ = com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.getDefaultInstance(); + } else { + wearInfoBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + if (unloadInfoBuilder_ == null) { + unloadInfo_ = com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.getDefaultInstance(); + } else { + unloadInfoBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_descriptor; + } + + public com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest.getDefaultInstance(); + } + + public com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest build() { + com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest buildPartial() { + com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest result = new com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + if (wearInfoBuilder_ == null) { + result.wearInfo_ = wearInfo_; + } else { + result.wearInfo_ = wearInfoBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + if (unloadInfoBuilder_ == null) { + result.unloadInfo_ = unloadInfo_; + } else { + result.unloadInfo_ = unloadInfoBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest) { + return mergeFrom((com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest other) { + if (other == com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest.getDefaultInstance()) return this; + if (other.hasWearInfo()) { + mergeWearInfo(other.getWearInfo()); + } + if (other.hasUnloadInfo()) { + mergeUnloadInfo(other.getUnloadInfo()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.ljsd.jieling.protocols.HeroInfoProto.SoulEquipWearRequest) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1; + private com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul wearInfo_ = com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul, com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.Builder, com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoulOrBuilder> wearInfoBuilder_; /** - * optional int32 type = 3;
- * - *- *1 一键装备 - *+ *optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
*/ - public boolean hasType() { - return ((bitField0_ & 0x00000004) == 0x00000004); + public boolean hasWearInfo() { + return ((bitField0_ & 0x00000001) == 0x00000001); } /** - *optional int32 type = 3;
- * - *- *1 一键装备 - *+ *optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
*/ - public int getType() { - return type_; + public com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul getWearInfo() { + if (wearInfoBuilder_ == null) { + return wearInfo_; + } else { + return wearInfoBuilder_.getMessage(); + } } /** - *optional int32 type = 3;
- * - *- *1 一键装备 - *+ *optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
*/ - public Builder setType(int value) { - bitField0_ |= 0x00000004; - type_ = value; - onChanged(); + public Builder setWearInfo(com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul value) { + if (wearInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + wearInfo_ = value; + onChanged(); + } else { + wearInfoBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; return this; } /** - *optional int32 type = 3;
- * - *- *1 一键装备 - *+ *optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
*/ - public Builder clearType() { - bitField0_ = (bitField0_ & ~0x00000004); - type_ = 0; - onChanged(); + public Builder setWearInfo( + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.Builder builderForValue) { + if (wearInfoBuilder_ == null) { + wearInfo_ = builderForValue.build(); + onChanged(); + } else { + wearInfoBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; return this; } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
+ */ + public Builder mergeWearInfo(com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul value) { + if (wearInfoBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + wearInfo_ != com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.getDefaultInstance()) { + wearInfo_ = + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.newBuilder(wearInfo_).mergeFrom(value).buildPartial(); + } else { + wearInfo_ = value; + } + onChanged(); + } else { + wearInfoBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
+ */ + public Builder clearWearInfo() { + if (wearInfoBuilder_ == null) { + wearInfo_ = com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.getDefaultInstance(); + onChanged(); + } else { + wearInfoBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
+ */ + public com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.Builder getWearInfoBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getWearInfoFieldBuilder().getBuilder(); + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
+ */ + public com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoulOrBuilder getWearInfoOrBuilder() { + if (wearInfoBuilder_ != null) { + return wearInfoBuilder_.getMessageOrBuilder(); + } else { + return wearInfo_; + } + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul wearInfo = 1;
+ */ + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul, com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.Builder, com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoulOrBuilder> + getWearInfoFieldBuilder() { + if (wearInfoBuilder_ == null) { + wearInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul, com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.Builder, com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoulOrBuilder>( + wearInfo_, + getParentForChildren(), + isClean()); + wearInfo_ = null; + } + return wearInfoBuilder_; + } + + // optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2; + private com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul unloadInfo_ = com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul, com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.Builder, com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoulOrBuilder> unloadInfoBuilder_; + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + public boolean hasUnloadInfo() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + public com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul getUnloadInfo() { + if (unloadInfoBuilder_ == null) { + return unloadInfo_; + } else { + return unloadInfoBuilder_.getMessage(); + } + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + public Builder setUnloadInfo(com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul value) { + if (unloadInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + unloadInfo_ = value; + onChanged(); + } else { + unloadInfoBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + public Builder setUnloadInfo( + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.Builder builderForValue) { + if (unloadInfoBuilder_ == null) { + unloadInfo_ = builderForValue.build(); + onChanged(); + } else { + unloadInfoBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + return this; + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + public Builder mergeUnloadInfo(com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul value) { + if (unloadInfoBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002) && + unloadInfo_ != com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.getDefaultInstance()) { + unloadInfo_ = + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.newBuilder(unloadInfo_).mergeFrom(value).buildPartial(); + } else { + unloadInfo_ = value; + } + onChanged(); + } else { + unloadInfoBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + public Builder clearUnloadInfo() { + if (unloadInfoBuilder_ == null) { + unloadInfo_ = com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.getDefaultInstance(); + onChanged(); + } else { + unloadInfoBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + public com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.Builder getUnloadInfoBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getUnloadInfoFieldBuilder().getBuilder(); + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + public com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoulOrBuilder getUnloadInfoOrBuilder() { + if (unloadInfoBuilder_ != null) { + return unloadInfoBuilder_.getMessageOrBuilder(); + } else { + return unloadInfo_; + } + } + /** + *optional .com.ljsd.jieling.protocols.OptHeroSoul unloadInfo = 2;
+ */ + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul, com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.Builder, com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoulOrBuilder> + getUnloadInfoFieldBuilder() { + if (unloadInfoBuilder_ == null) { + unloadInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul, com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoul.Builder, com.ljsd.jieling.protocols.HeroInfoProto.OptHeroSoulOrBuilder>( + unloadInfo_, + getParentForChildren(), + isClean()); + unloadInfo_ = null; + } + return unloadInfoBuilder_; + } // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.SoulEquipWearRequest) } @@ -23537,6 +24669,16 @@ public final class HeroInfoProto { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_com_ljsd_jieling_protocols_SoulEquipPos_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_com_ljsd_jieling_protocols_MergeSoulRequest_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_com_ljsd_jieling_protocols_MergeSoulRequest_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_com_ljsd_jieling_protocols_OptHeroSoul_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_com_ljsd_jieling_protocols_OptHeroSoul_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_descriptor; private static @@ -23676,42 +24818,46 @@ public final class HeroInfoProto { "\022\024\n\014soulEquipIds\030\004 \003(\t\"A\n\020EquipWearReque" + "st\022\016\n\006heroId\030\001 \001(\t\022\017\n\007equipId\030\002 \003(\t\022\014\n\004t" + "ype\030\003 \001(\005\"1\n\014SoulEquipPos\022\017\n\007equipId\030\001 \001", - "(\t\022\020\n\010position\030\002 \001(\005\"t\n\024SoulEquipWearReq" + - "uest\022\016\n\006heroId\030\001 \001(\t\022>\n\014soulEquipIds\030\002 \003" + - "(\0132(.com.ljsd.jieling.protocols.SoulEqui" + - "pPos\022\014\n\004type\030\003 \001(\005\"l\n\032SoulEquipUnLoadWea" + - "rRequest\022\016\n\006heroId\030\001 \001(\t\022>\n\014soulEquipIds" + - "\030\002 \003(\0132(.com.ljsd.jieling.protocols.Soul" + - "EquipPos\"G\n\025EquipUnLoadOptRequest\022\016\n\006her" + - "oId\030\001 \001(\t\022\020\n\010equipIds\030\002 \003(\t\022\014\n\004type\030\003 \001(" + - "\005\"D\n\022HeroComposeRequest\022.\n\004item\030\001 \001(\0132 ." + - "com.ljsd.jieling.protocols.Item\"E\n\023HeroC", - "omposeResponse\022.\n\004drop\030\001 \001(\0132 .com.ljsd." + - "jieling.protocols.Drop\"1\n\022GetAllEquipReq" + - "uest\022\r\n\005index\030\001 \001(\005\022\014\n\004type\030\002 \001(\005\"]\n\023Get" + - "AllEquipResponse\0220\n\005equip\030\001 \003(\0132!.com.lj" + - "sd.jieling.protocols.Equip\022\024\n\014isSendFini" + - "sh\030\002 \001(\010\"U\n\025GetAllPokemonResponse\022<\n\013pok" + - "emonInfo\030\001 \003(\0132\'.com.ljsd.jieling.protoc" + - "ols.PokemonInfo\"@\n\026PokenmonUpLevelReques" + - "t\022\021\n\tpokemonId\030\001 \001(\005\022\023\n\013comonpentId\030\002 \001(" + - "\005\"+\n\026PokemonAdvancedRequest\022\021\n\tpokemonId", - "\030\001 \001(\005\"=\n\023RingFireLoadRequest\022\021\n\tpokemon" + - "Id\030\001 \001(\005\022\023\n\013comonpentId\030\002 \001(\005\"*\n\025RingFir" + - "AdvanceRequest\022\021\n\tpokemonId\030\001 \001(\005\"X\n\026Get" + - "AllRingFireResponse\022>\n\014ringFireInfo\030\001 \003(" + - "\0132(.com.ljsd.jieling.protocols.RingFireI" + - "nfo\"\037\n\017SoulRandRequest\022\014\n\004time\030\001 \001(\005\"]\n\020" + - "SoulRandResponse\022.\n\004drop\030\001 \001(\0132 .com.ljs" + - "d.jieling.protocols.Drop\022\013\n\003pos\030\002 \001(\005\022\014\n" + - "\004time\030\003 \001(\005\"\026\n\024SoulForceRandRequest\"T\n\025S" + - "oulForceRandResponse\022.\n\004drop\030\001 \001(\0132 .com", - ".ljsd.jieling.protocols.Drop\022\013\n\003pos\030\002 \001(" + - "\005\"#\n\021HeroReturnRequest\022\016\n\006heroId\030\001 \001(\t\"D" + - "\n\022HeroReturnResponse\022.\n\004drop\030\001 \001(\0132 .com" + - ".ljsd.jieling.protocols.Drop\":\n\025HeroLock" + - "ChangeRequest\022\016\n\006heroId\030\001 \001(\t\022\021\n\tlockSta" + - "te\030\002 \001(\005B\002H\001" + "(\005\022\020\n\010position\030\002 \001(\005\"4\n\020MergeSoulRequest" + + "\022\020\n\010targetId\030\001 \001(\005\022\016\n\006soulId\030\002 \003(\005\"]\n\013Op" + + "tHeroSoul\022\016\n\006heroId\030\001 \001(\t\022>\n\014soulEquipId" + + "s\030\002 \003(\0132(.com.ljsd.jieling.protocols.Sou" + + "lEquipPos\"\216\001\n\024SoulEquipWearRequest\0229\n\010we" + + "arInfo\030\001 \001(\0132\'.com.ljsd.jieling.protocol" + + "s.OptHeroSoul\022;\n\nunloadInfo\030\002 \001(\0132\'.com." + + "ljsd.jieling.protocols.OptHeroSoul\"l\n\032So" + + "ulEquipUnLoadWearRequest\022\016\n\006heroId\030\001 \001(\t" + + "\022>\n\014soulEquipIds\030\002 \003(\0132(.com.ljsd.jielin", + "g.protocols.SoulEquipPos\"G\n\025EquipUnLoadO" + + "ptRequest\022\016\n\006heroId\030\001 \001(\t\022\020\n\010equipIds\030\002 " + + "\003(\t\022\014\n\004type\030\003 \001(\005\"D\n\022HeroComposeRequest\022" + + ".\n\004item\030\001 \001(\0132 .com.ljsd.jieling.protoco" + + "ls.Item\"E\n\023HeroComposeResponse\022.\n\004drop\030\001" + + " \001(\0132 .com.ljsd.jieling.protocols.Drop\"1" + + "\n\022GetAllEquipRequest\022\r\n\005index\030\001 \001(\005\022\014\n\004t" + + "ype\030\002 \001(\005\"]\n\023GetAllEquipResponse\0220\n\005equi" + + "p\030\001 \003(\0132!.com.ljsd.jieling.protocols.Equ" + + "ip\022\024\n\014isSendFinish\030\002 \001(\010\"U\n\025GetAllPokemo", + "nResponse\022<\n\013pokemonInfo\030\001 \003(\0132\'.com.ljs" + + "d.jieling.protocols.PokemonInfo\"@\n\026Poken" + + "monUpLevelRequest\022\021\n\tpokemonId\030\001 \001(\005\022\023\n\013" + + "comonpentId\030\002 \001(\005\"+\n\026PokemonAdvancedRequ" + + "est\022\021\n\tpokemonId\030\001 \001(\005\"=\n\023RingFireLoadRe" + + "quest\022\021\n\tpokemonId\030\001 \001(\005\022\023\n\013comonpentId\030" + + "\002 \001(\005\"*\n\025RingFirAdvanceRequest\022\021\n\tpokemo" + + "nId\030\001 \001(\005\"X\n\026GetAllRingFireResponse\022>\n\014r" + + "ingFireInfo\030\001 \003(\0132(.com.ljsd.jieling.pro" + + "tocols.RingFireInfo\"\037\n\017SoulRandRequest\022\014", + "\n\004time\030\001 \001(\005\"]\n\020SoulRandResponse\022.\n\004drop" + + "\030\001 \001(\0132 .com.ljsd.jieling.protocols.Drop" + + "\022\013\n\003pos\030\002 \001(\005\022\014\n\004time\030\003 \001(\005\"\026\n\024SoulForce" + + "RandRequest\"T\n\025SoulForceRandResponse\022.\n\004" + + "drop\030\001 \001(\0132 .com.ljsd.jieling.protocols." + + "Drop\022\013\n\003pos\030\002 \001(\005\"#\n\021HeroReturnRequest\022\016" + + "\n\006heroId\030\001 \001(\t\"D\n\022HeroReturnResponse\022.\n\004" + + "drop\030\001 \001(\0132 .com.ljsd.jieling.protocols." + + "Drop\":\n\025HeroLockChangeRequest\022\016\n\006heroId\030" + + "\001 \001(\t\022\021\n\tlockState\030\002 \001(\005B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -23814,122 +24960,134 @@ public final class HeroInfoProto { com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SoulEquipPos_descriptor, new java.lang.String[] { "EquipId", "Position", }); - internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_descriptor = + internal_static_com_ljsd_jieling_protocols_MergeSoulRequest_descriptor = getDescriptor().getMessageTypes().get(16); + internal_static_com_ljsd_jieling_protocols_MergeSoulRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_com_ljsd_jieling_protocols_MergeSoulRequest_descriptor, + new java.lang.String[] { "TargetId", "SoulId", }); + internal_static_com_ljsd_jieling_protocols_OptHeroSoul_descriptor = + getDescriptor().getMessageTypes().get(17); + internal_static_com_ljsd_jieling_protocols_OptHeroSoul_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_com_ljsd_jieling_protocols_OptHeroSoul_descriptor, + new java.lang.String[] { "HeroId", "SoulEquipIds", }); + internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_descriptor = + getDescriptor().getMessageTypes().get(18); internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_descriptor, - new java.lang.String[] { "HeroId", "SoulEquipIds", "Type", }); + new java.lang.String[] { "WearInfo", "UnloadInfo", }); internal_static_com_ljsd_jieling_protocols_SoulEquipUnLoadWearRequest_descriptor = - getDescriptor().getMessageTypes().get(17); + getDescriptor().getMessageTypes().get(19); internal_static_com_ljsd_jieling_protocols_SoulEquipUnLoadWearRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SoulEquipUnLoadWearRequest_descriptor, new java.lang.String[] { "HeroId", "SoulEquipIds", }); internal_static_com_ljsd_jieling_protocols_EquipUnLoadOptRequest_descriptor = - getDescriptor().getMessageTypes().get(18); + getDescriptor().getMessageTypes().get(20); internal_static_com_ljsd_jieling_protocols_EquipUnLoadOptRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_EquipUnLoadOptRequest_descriptor, new java.lang.String[] { "HeroId", "EquipIds", "Type", }); internal_static_com_ljsd_jieling_protocols_HeroComposeRequest_descriptor = - getDescriptor().getMessageTypes().get(19); + getDescriptor().getMessageTypes().get(21); internal_static_com_ljsd_jieling_protocols_HeroComposeRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_HeroComposeRequest_descriptor, new java.lang.String[] { "Item", }); internal_static_com_ljsd_jieling_protocols_HeroComposeResponse_descriptor = - getDescriptor().getMessageTypes().get(20); + getDescriptor().getMessageTypes().get(22); internal_static_com_ljsd_jieling_protocols_HeroComposeResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_HeroComposeResponse_descriptor, new java.lang.String[] { "Drop", }); internal_static_com_ljsd_jieling_protocols_GetAllEquipRequest_descriptor = - getDescriptor().getMessageTypes().get(21); + getDescriptor().getMessageTypes().get(23); internal_static_com_ljsd_jieling_protocols_GetAllEquipRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_GetAllEquipRequest_descriptor, new java.lang.String[] { "Index", "Type", }); internal_static_com_ljsd_jieling_protocols_GetAllEquipResponse_descriptor = - getDescriptor().getMessageTypes().get(22); + getDescriptor().getMessageTypes().get(24); internal_static_com_ljsd_jieling_protocols_GetAllEquipResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_GetAllEquipResponse_descriptor, new java.lang.String[] { "Equip", "IsSendFinish", }); internal_static_com_ljsd_jieling_protocols_GetAllPokemonResponse_descriptor = - getDescriptor().getMessageTypes().get(23); + getDescriptor().getMessageTypes().get(25); internal_static_com_ljsd_jieling_protocols_GetAllPokemonResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_GetAllPokemonResponse_descriptor, new java.lang.String[] { "PokemonInfo", }); internal_static_com_ljsd_jieling_protocols_PokenmonUpLevelRequest_descriptor = - getDescriptor().getMessageTypes().get(24); + getDescriptor().getMessageTypes().get(26); internal_static_com_ljsd_jieling_protocols_PokenmonUpLevelRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_PokenmonUpLevelRequest_descriptor, new java.lang.String[] { "PokemonId", "ComonpentId", }); internal_static_com_ljsd_jieling_protocols_PokemonAdvancedRequest_descriptor = - getDescriptor().getMessageTypes().get(25); + getDescriptor().getMessageTypes().get(27); internal_static_com_ljsd_jieling_protocols_PokemonAdvancedRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_PokemonAdvancedRequest_descriptor, new java.lang.String[] { "PokemonId", }); internal_static_com_ljsd_jieling_protocols_RingFireLoadRequest_descriptor = - getDescriptor().getMessageTypes().get(26); + getDescriptor().getMessageTypes().get(28); internal_static_com_ljsd_jieling_protocols_RingFireLoadRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_RingFireLoadRequest_descriptor, new java.lang.String[] { "PokemonId", "ComonpentId", }); internal_static_com_ljsd_jieling_protocols_RingFirAdvanceRequest_descriptor = - getDescriptor().getMessageTypes().get(27); + getDescriptor().getMessageTypes().get(29); internal_static_com_ljsd_jieling_protocols_RingFirAdvanceRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_RingFirAdvanceRequest_descriptor, new java.lang.String[] { "PokemonId", }); internal_static_com_ljsd_jieling_protocols_GetAllRingFireResponse_descriptor = - getDescriptor().getMessageTypes().get(28); + getDescriptor().getMessageTypes().get(30); internal_static_com_ljsd_jieling_protocols_GetAllRingFireResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_GetAllRingFireResponse_descriptor, new java.lang.String[] { "RingFireInfo", }); internal_static_com_ljsd_jieling_protocols_SoulRandRequest_descriptor = - getDescriptor().getMessageTypes().get(29); + getDescriptor().getMessageTypes().get(31); internal_static_com_ljsd_jieling_protocols_SoulRandRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SoulRandRequest_descriptor, new java.lang.String[] { "Time", }); internal_static_com_ljsd_jieling_protocols_SoulRandResponse_descriptor = - getDescriptor().getMessageTypes().get(30); + getDescriptor().getMessageTypes().get(32); internal_static_com_ljsd_jieling_protocols_SoulRandResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SoulRandResponse_descriptor, new java.lang.String[] { "Drop", "Pos", "Time", }); internal_static_com_ljsd_jieling_protocols_SoulForceRandRequest_descriptor = - getDescriptor().getMessageTypes().get(31); + getDescriptor().getMessageTypes().get(33); internal_static_com_ljsd_jieling_protocols_SoulForceRandRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SoulForceRandRequest_descriptor, new java.lang.String[] { }); internal_static_com_ljsd_jieling_protocols_SoulForceRandResponse_descriptor = - getDescriptor().getMessageTypes().get(32); + getDescriptor().getMessageTypes().get(34); internal_static_com_ljsd_jieling_protocols_SoulForceRandResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SoulForceRandResponse_descriptor, new java.lang.String[] { "Drop", "Pos", }); internal_static_com_ljsd_jieling_protocols_HeroReturnRequest_descriptor = - getDescriptor().getMessageTypes().get(33); + getDescriptor().getMessageTypes().get(35); internal_static_com_ljsd_jieling_protocols_HeroReturnRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_HeroReturnRequest_descriptor, new java.lang.String[] { "HeroId", }); internal_static_com_ljsd_jieling_protocols_HeroReturnResponse_descriptor = - getDescriptor().getMessageTypes().get(34); + getDescriptor().getMessageTypes().get(36); internal_static_com_ljsd_jieling_protocols_HeroReturnResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_HeroReturnResponse_descriptor, new java.lang.String[] { "Drop", }); internal_static_com_ljsd_jieling_protocols_HeroLockChangeRequest_descriptor = - getDescriptor().getMessageTypes().get(35); + getDescriptor().getMessageTypes().get(37); internal_static_com_ljsd_jieling_protocols_HeroLockChangeRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_HeroLockChangeRequest_descriptor, diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/MessageTypeProto.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/MessageTypeProto.java index e590efacc..35fd91344 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/MessageTypeProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/MessageTypeProto.java @@ -2676,6 +2676,18 @@ public final class MessageTypeProto { *SOUL_FORCE_RAND_EQUIP_RESPONSE = 11838;
*/ SOUL_FORCE_RAND_EQUIP_RESPONSE(425, 11838), + /** + *SOUL_MERGE_REQUEST = 11839;
+ * + *+ *合成魂印 + *+ */ + SOUL_MERGE_REQUEST(426, 11839), + /** + *SOUL_MERGE_RESPONSE = 11840;
+ */ + SOUL_MERGE_RESPONSE(427, 11840), /** *TRIGGER_EVENT_REQUEST = 11900;
* @@ -2683,11 +2695,11 @@ public final class MessageTypeProto { * T 11900 *TRIGGER_EVENT_RESPONSE = 11901;
*/ - TRIGGER_EVENT_RESPONSE(427, 11901), + TRIGGER_EVENT_RESPONSE(429, 11901), /** *TEAM_POS_SAVE_REQUEST = 11902;
* @@ -2695,11 +2707,11 @@ public final class MessageTypeProto { *保存阵容 *TEAM_POS_SAVE_RESPONSE = 11903;
*/ - TEAM_POS_SAVE_RESPONSE(429, 11903), + TEAM_POS_SAVE_RESPONSE(431, 11903), /** *TAKE_ACTIVITY_REWARD_REQUEST = 11904;
* @@ -2707,11 +2719,11 @@ public final class MessageTypeProto { *领取活动奖励 *TAKE_ACTIVITY_REWARD_RESPONSE = 11905;
*/ - TAKE_ACTIVITY_REWARD_RESPONSE(431, 11905), + TAKE_ACTIVITY_REWARD_RESPONSE(433, 11905), /** *TAKE_MISSION_REWARD_REQUEST = 11906;
* @@ -2719,11 +2731,11 @@ public final class MessageTypeProto { *领取任务奖励 *TAKE_MISSION_REWARD_RESPONSE = 11907;
*/ - TAKE_MISSION_REWARD_RESPONSE(433, 11907), + TAKE_MISSION_REWARD_RESPONSE(435, 11907), /** *TEST_BUY_GIGT_GOODS_REQEUST = 11908;
* @@ -2731,11 +2743,11 @@ public final class MessageTypeProto { *测试购买礼包 *TEST_BUY_GIGT_GOODS_RESPONSE = 11909;
*/ - TEST_BUY_GIGT_GOODS_RESPONSE(435, 11909), + TEST_BUY_GIGT_GOODS_RESPONSE(437, 11909), /** *TAKE_TOWER_REWARD_REQUEST = 11910;
* @@ -2743,11 +2755,11 @@ public final class MessageTypeProto { *领取层级奖励 *TAKE_TOWER_REWARD_RESPONSE = 11911;
*/ - TAKE_TOWER_REWARD_RESPONSE(437, 11911), + TAKE_TOWER_REWARD_RESPONSE(439, 11911), /** *TAKE_SEVEN_HAPPY_REWARD_REQUEST = 11912;
* @@ -2755,11 +2767,11 @@ public final class MessageTypeProto { * 领取七日狂欢积分奖励 *TAKE_SEVEN_HAPPY_REWARD_RESPONSE = 11913;
*/ - TAKE_SEVEN_HAPPY_REWARD_RESPONSE(439, 11913), + TAKE_SEVEN_HAPPY_REWARD_RESPONSE(441, 11913), /** *TO_BE_STRONGER_REQUEST = 11914;
* @@ -2767,11 +2779,11 @@ public final class MessageTypeProto { *我要变强 *
TO_BE_STRONGER_RESPONSE = 11915;
*/
- TO_BE_STRONGER_RESPONSE(441, 11915),
+ TO_BE_STRONGER_RESPONSE(443, 11915),
/**
* TREASURE_REFRESH_INDICATION = 11916;
*
@@ -2779,7 +2791,7 @@ public final class MessageTypeProto {
*戒灵秘宝刷新推送
*
*/
- TREASURE_REFRESH_INDICATION(442, 11916),
+ TREASURE_REFRESH_INDICATION(444, 11916),
/**
* TREASURE_LEVELUP_INDICATION = 11917;
*
@@ -2787,7 +2799,7 @@ public final class MessageTypeProto {
*戒灵秘宝等级提升推送
*
*/
- TREASURE_LEVELUP_INDICATION(443, 11917),
+ TREASURE_LEVELUP_INDICATION(445, 11917),
/**
* TREASURE_REFRESH_TIME_REQUEST = 11918;
*
@@ -2795,11 +2807,11 @@ public final class MessageTypeProto {
*戒灵秘宝刷新时间获取
*
*/
- TREASURE_REFRESH_TIME_REQUEST(444, 11918),
+ TREASURE_REFRESH_TIME_REQUEST(446, 11918),
/**
* TREASURE_REFRESH_TIME_RESPONSE = 11919;
*/
- TREASURE_REFRESH_TIME_RESPONSE(445, 11919),
+ TREASURE_REFRESH_TIME_RESPONSE(447, 11919),
/**
* UP_HERO_LEVEL_REQUEST = 12000;
*
@@ -2807,11 +2819,11 @@ public final class MessageTypeProto {
* U 12000
*
*/
- UP_HERO_LEVEL_REQUEST(446, 12000),
+ UP_HERO_LEVEL_REQUEST(448, 12000),
/**
* UP_HERO_LEVEL_RESPONSE = 12001;
*/
- UP_HERO_LEVEL_RESPONSE(447, 12001),
+ UP_HERO_LEVEL_RESPONSE(449, 12001),
/**
* UP_HERO_STAR_REQUEST = 12002;
*
@@ -2819,11 +2831,11 @@ public final class MessageTypeProto {
* 升星
*
*/
- UP_HERO_STAR_REQUEST(448, 12002),
+ UP_HERO_STAR_REQUEST(450, 12002),
/**
* UP_HERO_STAR_RESPONSE = 12003;
*/
- UP_HERO_STAR_RESPONSE(449, 12003),
+ UP_HERO_STAR_RESPONSE(451, 12003),
/**
* USER_AND_PRICE_ITEM_REQUEST = 12004;
*
@@ -2831,11 +2843,11 @@ public final class MessageTypeProto {
*使用出售道具
*
*/
- USER_AND_PRICE_ITEM_REQUEST(450, 12004),
+ USER_AND_PRICE_ITEM_REQUEST(452, 12004),
/**
* USER_AND_PRICE_ITEM_RESPONSE = 12005;
*/
- USER_AND_PRICE_ITEM_RESPONSE(451, 12005),
+ USER_AND_PRICE_ITEM_RESPONSE(453, 12005),
/**
* USER_FORCE_CHANGE_REQUEST = 12006;
*
@@ -2843,11 +2855,11 @@ public final class MessageTypeProto {
*用户战力提升
*
*/
- USER_FORCE_CHANGE_REQUEST(452, 12006),
+ USER_FORCE_CHANGE_REQUEST(454, 12006),
/**
* USER_FORCE_CHANGE_RESPONSE = 12007;
*/
- USER_FORCE_CHANGE_RESPONSE(453, 12007),
+ USER_FORCE_CHANGE_RESPONSE(455, 12007),
/**
* UPDATE_BAG_INDICATION = 12008;
*
@@ -2855,7 +2867,7 @@ public final class MessageTypeProto {
*更新背包
*
*/
- UPDATE_BAG_INDICATION(454, 12008),
+ UPDATE_BAG_INDICATION(456, 12008),
/**
* UPDATE_STATE_REQUEST = 12009;
*
@@ -2863,11 +2875,11 @@ public final class MessageTypeProto {
* 更新客户状态
*
*/
- UPDATE_STATE_REQUEST(455, 12009),
+ UPDATE_STATE_REQUEST(457, 12009),
/**
* UPDATE_STATE_RESPONSE = 12010;
*/
- UPDATE_STATE_RESPONSE(456, 12010),
+ UPDATE_STATE_RESPONSE(458, 12010),
/**
* UPDATE_USER_EXP_INDICATION = 12011;
*
@@ -2875,7 +2887,7 @@ public final class MessageTypeProto {
* 更新玩家等级经验信息
*
*/
- UPDATE_USER_EXP_INDICATION(457, 12011),
+ UPDATE_USER_EXP_INDICATION(459, 12011),
/**
* UPDATE_SECRET_BOX_SEASON_INDICATION = 12012;
*
@@ -2883,7 +2895,7 @@ public final class MessageTypeProto {
* 更新秘盒赛季信息
*
*/
- UPDATE_SECRET_BOX_SEASON_INDICATION(458, 12012),
+ UPDATE_SECRET_BOX_SEASON_INDICATION(460, 12012),
/**
* UPDATE_PHONE_INFO_REQUEST = 12013;
*
@@ -2891,11 +2903,11 @@ public final class MessageTypeProto {
*更新手机号
*
*/
- UPDATE_PHONE_INFO_REQUEST(459, 12013),
+ UPDATE_PHONE_INFO_REQUEST(461, 12013),
/**
* UPDATE_PHONE_INFO_RESPONSE = 12014;
*/
- UPDATE_PHONE_INFO_RESPONSE(460, 12014),
+ UPDATE_PHONE_INFO_RESPONSE(462, 12014),
/**
* UPDATE_QUESTION_REQUEST = 12015;
*
@@ -2903,15 +2915,15 @@ public final class MessageTypeProto {
*问卷
*
*/
- UPDATE_QUESTION_REQUEST(461, 12015),
+ UPDATE_QUESTION_REQUEST(463, 12015),
/**
* UPDATE_QUESTION_RESPONSE = 12016;
*/
- UPDATE_QUESTION_RESPONSE(462, 12016),
+ UPDATE_QUESTION_RESPONSE(464, 12016),
/**
* UP_SOUL_EQUIP_QUICK_REQUEST = 12018;
*/
- UP_SOUL_EQUIP_QUICK_REQUEST(463, 12018),
+ UP_SOUL_EQUIP_QUICK_REQUEST(465, 12018),
/**
* UP_SOUL_EQUIP_RESPONSE = 12019;
*
@@ -2919,7 +2931,7 @@ public final class MessageTypeProto {
*魂印升级
*
*/
- UP_SOUL_EQUIP_RESPONSE(464, 12019),
+ UP_SOUL_EQUIP_RESPONSE(466, 12019),
/**
* VIEW_FIGHTREPLAY_REQUEST = 12100;
*
@@ -2927,11 +2939,11 @@ public final class MessageTypeProto {
* V 12100
*
*/
- VIEW_FIGHTREPLAY_REQUEST(465, 12100),
+ VIEW_FIGHTREPLAY_REQUEST(467, 12100),
/**
* VIEW_FIGHTREPLAY_RESPONSE = 12101;
*/
- VIEW_FIGHTREPLAY_RESPONSE(466, 12101),
+ VIEW_FIGHTREPLAY_RESPONSE(468, 12101),
/**
* VIP_LEVELUP_REQEUST = 12102;
*
@@ -2939,11 +2951,11 @@ public final class MessageTypeProto {
*VIP等级提升
*
*/
- VIP_LEVELUP_REQEUST(467, 12102),
+ VIP_LEVELUP_REQEUST(469, 12102),
/**
* VIP_LEVELUP_RESPONSE = 12103;
*/
- VIP_LEVELUP_RESPONSE(468, 12103),
+ VIP_LEVELUP_RESPONSE(470, 12103),
/**
* VIP_TAKE_REWARD_REQUEST = 12104;
*
@@ -2951,11 +2963,11 @@ public final class MessageTypeProto {
*领取vip等级或每日礼包
*
*/
- VIP_TAKE_REWARD_REQUEST(469, 12104),
+ VIP_TAKE_REWARD_REQUEST(471, 12104),
/**
* VIP_TAKE_REWARD_RESPONSE = 12105;
*/
- VIP_TAKE_REWARD_RESPONSE(470, 12105),
+ VIP_TAKE_REWARD_RESPONSE(472, 12105),
/**
* VIEW_HERO_INFO_REQUEST = 12106;
*
@@ -2963,11 +2975,11 @@ public final class MessageTypeProto {
* 查看英雄详情信息
*
*/
- VIEW_HERO_INFO_REQUEST(471, 12106),
+ VIEW_HERO_INFO_REQUEST(473, 12106),
/**
* VIEW_HERO_INFO_RESPONSE = 12107;
*/
- VIEW_HERO_INFO_RESPONSE(472, 12107),
+ VIEW_HERO_INFO_RESPONSE(474, 12107),
/**
* VIP_TAKE_DAILY_REQUEST = 12108;
*
@@ -2975,11 +2987,11 @@ public final class MessageTypeProto {
*领取vip每日礼包
*
*/
- VIP_TAKE_DAILY_REQUEST(473, 12108),
+ VIP_TAKE_DAILY_REQUEST(475, 12108),
/**
* VIP_TAKE_DAILY_RESPONSE = 12109;
*/
- VIP_TAKE_DAILY_RESPONSE(474, 12109),
+ VIP_TAKE_DAILY_RESPONSE(476, 12109),
/**
* WORKSHOP_FOUNDATION_REQUEST = 12200;
*
@@ -2987,11 +2999,11 @@ public final class MessageTypeProto {
* W 12200
*
*/
- WORKSHOP_FOUNDATION_REQUEST(475, 12200),
+ WORKSHOP_FOUNDATION_REQUEST(477, 12200),
/**
* WORKSHOP_FOUNDATION_RESPONSE = 12201;
*/
- WORKSHOP_FOUNDATION_RESPONSE(476, 12201),
+ WORKSHOP_FOUNDATION_RESPONSE(478, 12201),
/**
* WORKSHOP_EQUIP_CREATE_REQUEST = 12202;
*
@@ -2999,11 +3011,11 @@ public final class MessageTypeProto {
*装备打造
*
*/
- WORKSHOP_EQUIP_CREATE_REQUEST(477, 12202),
+ WORKSHOP_EQUIP_CREATE_REQUEST(479, 12202),
/**
* WORKSHOP_EQUIP_CREATE_RESPONSE = 12203;
*/
- WORKSHOP_EQUIP_CREATE_RESPONSE(478, 12203),
+ WORKSHOP_EQUIP_CREATE_RESPONSE(480, 12203),
/**
* WORKSHOP_REBUILD_REQUEST = 12204;
*
@@ -3011,11 +3023,11 @@ public final class MessageTypeProto {
*装备重铸
*
*/
- WORKSHOP_REBUILD_REQUEST(479, 12204),
+ WORKSHOP_REBUILD_REQUEST(481, 12204),
/**
* WORKSHOP_REBUILD_RESPONSE = 12205;
*/
- WORKSHOP_REBUILD_RESPONSE(480, 12205),
+ WORKSHOP_REBUILD_RESPONSE(482, 12205),
/**
* WORKSHOP_REBUILD_CONFIRM_REQUEST = 12206;
*
@@ -3023,11 +3035,11 @@ public final class MessageTypeProto {
* 重铸确认
*
*/
- WORKSHOP_REBUILD_CONFIRM_REQUEST(481, 12206),
+ WORKSHOP_REBUILD_CONFIRM_REQUEST(483, 12206),
/**
* WORKSHOP_REBUILD_CONFIRM_RESONSE = 12207;
*/
- WORKSHOP_REBUILD_CONFIRM_RESONSE(482, 12207),
+ WORKSHOP_REBUILD_CONFIRM_RESONSE(484, 12207),
/**
* WORKSHOP_LEVELUP_REQUEST = 12208;
*
@@ -3035,11 +3047,11 @@ public final class MessageTypeProto {
*工坊升级
*
*/
- WORKSHOP_LEVELUP_REQUEST(483, 12208),
+ WORKSHOP_LEVELUP_REQUEST(485, 12208),
/**
* WORKSHOP_LEVELUP_RESPONSE = 12209;
*/
- WORKSHOP_LEVELUP_RESPONSE(484, 12209),
+ WORKSHOP_LEVELUP_RESPONSE(486, 12209),
/**
* WORKSHOP_TECHNOLOGY_LEVEL_REQUEST = 12210;
*
@@ -3047,11 +3059,11 @@ public final class MessageTypeProto {
*科技树升级
*
*/
- WORKSHOP_TECHNOLOGY_LEVEL_REQUEST(485, 12210),
+ WORKSHOP_TECHNOLOGY_LEVEL_REQUEST(487, 12210),
/**
* WORKSHOP_TECHNOLOGY_RESPONSE = 12211;
*/
- WORKSHOP_TECHNOLOGY_RESPONSE(486, 12211),
+ WORKSHOP_TECHNOLOGY_RESPONSE(488, 12211),
/**
* WORKSHOP_TECHNOLOGY_RESET_REQUEST = 12212;
*
@@ -3059,11 +3071,11 @@ public final class MessageTypeProto {
*科技树重置
*
*/
- WORKSHOP_TECHNOLOGY_RESET_REQUEST(487, 12212),
+ WORKSHOP_TECHNOLOGY_RESET_REQUEST(489, 12212),
/**
* WORKSHOP_TECHNOLOGY_RESET_RESPONSE = 12213;
*/
- WORKSHOP_TECHNOLOGY_RESET_RESPONSE(488, 12213),
+ WORKSHOP_TECHNOLOGY_RESET_RESPONSE(490, 12213),
/**
* EXPEDITION_GET_EXPEDITION_REQUEST = 20002;
*
@@ -3071,11 +3083,11 @@ public final class MessageTypeProto {
*获取节点信息
*
*/
- EXPEDITION_GET_EXPEDITION_REQUEST(489, 20002),
+ EXPEDITION_GET_EXPEDITION_REQUEST(491, 20002),
/**
* EXPEDITION_GET_EXPEDITION_RESONSE = 20003;
*/
- EXPEDITION_GET_EXPEDITION_RESONSE(490, 20003),
+ EXPEDITION_GET_EXPEDITION_RESONSE(492, 20003),
/**
* EXPEDITION_TAKE_BOXREWARD_REQUEST = 20004;
*
@@ -3083,11 +3095,11 @@ public final class MessageTypeProto {
*获取层级奖励
*
*/
- EXPEDITION_TAKE_BOXREWARD_REQUEST(491, 20004),
+ EXPEDITION_TAKE_BOXREWARD_REQUEST(493, 20004),
/**
* EXPEDITION_TAKE_BOXREWARD_RESONSE = 20005;
*/
- EXPEDITION_TAKE_BOXREWARD_RESONSE(492, 20005),
+ EXPEDITION_TAKE_BOXREWARD_RESONSE(494, 20005),
/**
* EXPEDITION_RELIVE_HERO_REQUEST = 20006;
*
@@ -3095,11 +3107,11 @@ public final class MessageTypeProto {
*复活英雄
*
*/
- EXPEDITION_RELIVE_HERO_REQUEST(493, 20006),
+ EXPEDITION_RELIVE_HERO_REQUEST(495, 20006),
/**
* EXPEDITION_RELIVE_HERO_RESONSE = 20007;
*/
- EXPEDITION_RELIVE_HERO_RESONSE(494, 20007),
+ EXPEDITION_RELIVE_HERO_RESONSE(496, 20007),
/**
* EXPEDITION_START_BATTLE_REQUEST = 20008;
*
@@ -3107,11 +3119,11 @@ public final class MessageTypeProto {
*开始节点战斗操作
*
*/
- EXPEDITION_START_BATTLE_REQUEST(495, 20008),
+ EXPEDITION_START_BATTLE_REQUEST(497, 20008),
/**
* EXPEDITION_START_BATTLE_RESONSE = 20009;
*/
- EXPEDITION_START_BATTLE_RESONSE(496, 20009),
+ EXPEDITION_START_BATTLE_RESONSE(498, 20009),
/**
* EXPEDITION_END_BATTLE_REQUEST = 20010;
*
@@ -3119,11 +3131,11 @@ public final class MessageTypeProto {
*结束节点战斗操作
*
*/
- EXPEDITION_END_BATTLE_REQUEST(497, 20010),
+ EXPEDITION_END_BATTLE_REQUEST(499, 20010),
/**
* EXPEDITION_END_BATTLE_RESONSE = 20011;
*/
- EXPEDITION_END_BATTLE_RESONSE(498, 20011),
+ EXPEDITION_END_BATTLE_RESONSE(500, 20011),
/**
* EXPEDITION_TAKE_HOLY_EQUIP_REQUEST = 20012;
*
@@ -3131,11 +3143,11 @@ public final class MessageTypeProto {
*领取圣物
*
*/
- EXPEDITION_TAKE_HOLY_EQUIP_REQUEST(499, 20012),
+ EXPEDITION_TAKE_HOLY_EQUIP_REQUEST(501, 20012),
/**
* EXPEDITION_TAKE_HOLY_EQUIP_RESONSE = 20013;
*/
- EXPEDITION_TAKE_HOLY_EQUIP_RESONSE(500, 20013),
+ EXPEDITION_TAKE_HOLY_EQUIP_RESONSE(502, 20013),
/**
* EXPEDITION_RECOVER_HERO_REQUEST = 20014;
*
@@ -3143,11 +3155,11 @@ public final class MessageTypeProto {
*恢复英雄
*
*/
- EXPEDITION_RECOVER_HERO_REQUEST(501, 20014),
+ EXPEDITION_RECOVER_HERO_REQUEST(503, 20014),
/**
* EXPEDITION_RECOVER_HERO_RESONSE = 20015;
*/
- EXPEDITION_RECOVER_HERO_RESONSE(502, 20015),
+ EXPEDITION_RECOVER_HERO_RESONSE(504, 20015),
/**
* EXPEDITION_HOLY_BAG_INDICATION = 20016;
*
@@ -3155,7 +3167,7 @@ public final class MessageTypeProto {
*臨時背包推送
*
*/
- EXPEDITION_HOLY_BAG_INDICATION(503, 20016),
+ EXPEDITION_HOLY_BAG_INDICATION(505, 20016),
/**
* EXPEDITION_NOINFO_INDICATION = 20017;
*
@@ -3163,7 +3175,7 @@ public final class MessageTypeProto {
*节点状态推送
*
*/
- EXPEDITION_NOINFO_INDICATION(504, 20017),
+ EXPEDITION_NOINFO_INDICATION(506, 20017),
/**
* MONTHCARD_TAKE_DAILY_REQUEST = 20101;
*
@@ -3171,15 +3183,15 @@ public final class MessageTypeProto {
* 20101 - 20110 月卡
*
*/
- MONTHCARD_TAKE_DAILY_REQUEST(505, 20101),
+ MONTHCARD_TAKE_DAILY_REQUEST(507, 20101),
/**
* MONTHCARD_TAKE_DAILY_RESPONSE = 20102;
*/
- MONTHCARD_TAKE_DAILY_RESPONSE(506, 20102),
+ MONTHCARD_TAKE_DAILY_RESPONSE(508, 20102),
/**
* MONTHCARD_INDICATION = 20103;
*/
- MONTHCARD_INDICATION(507, 20103),
+ MONTHCARD_INDICATION(509, 20103),
;
/**
@@ -5845,6 +5857,18 @@ public final class MessageTypeProto {
* SOUL_FORCE_RAND_EQUIP_RESPONSE = 11838;
*/
public static final int SOUL_FORCE_RAND_EQUIP_RESPONSE_VALUE = 11838;
+ /**
+ * SOUL_MERGE_REQUEST = 11839;
+ *
+ * + *合成魂印 + *+ */ + public static final int SOUL_MERGE_REQUEST_VALUE = 11839; + /** + *
SOUL_MERGE_RESPONSE = 11840;
+ */
+ public static final int SOUL_MERGE_RESPONSE_VALUE = 11840;
/**
* TRIGGER_EVENT_REQUEST = 11900;
*
@@ -6781,6 +6805,8 @@ public final class MessageTypeProto {
case 11836: return SOUL_RAND_EQUIP_RESPONSE;
case 11837: return SOUL_FORCE_RAND_EQUIP_REQUEST;
case 11838: return SOUL_FORCE_RAND_EQUIP_RESPONSE;
+ case 11839: return SOUL_MERGE_REQUEST;
+ case 11840: return SOUL_MERGE_RESPONSE;
case 11900: return TRIGGER_EVENT_REQUEST;
case 11901: return TRIGGER_EVENT_RESPONSE;
case 11902: return TEAM_POS_SAVE_REQUEST;
@@ -6924,7 +6950,7 @@ public final class MessageTypeProto {
static {
java.lang.String[] descriptorData = {
"\n\026MessageTypeProto.proto\022\032com.ljsd.jieli" +
- "ng.protocols*\216\201\001\n\013MessageType\022\027\n\022HEART_B" +
+ "ng.protocols*\301\201\001\n\013MessageType\022\027\n\022HEART_B" +
"EAT_REQUEST\020\350\007\022\030\n\023HEART_BEAT_RESPONSE\020\351\007" +
"\022\036\n\031ACTIVITE_WORKSHOP_REQUEST\020\224N\022\037\n\032ACTI" +
"VITE_WORKSHOP_RESPONSE\020\225N\022\027\n\022ARENA_INFO_" +
@@ -7267,77 +7293,78 @@ public final class MessageTypeProto {
"P_UNLOAD_OPT_RESPONSE\020\272\\\022\034\n\027SOUL_RAND_EQ" +
"UIP_REQUEST\020\273\\\022\035\n\030SOUL_RAND_EQUIP_RESPON" +
"SE\020\274\\\022\"\n\035SOUL_FORCE_RAND_EQUIP_REQUEST\020\275" +
- "\\\022#\n\036SOUL_FORCE_RAND_EQUIP_RESPONSE\020\276\\\022\032" +
- "\n\025TRIGGER_EVENT_REQUEST\020\374\\\022\033\n\026TRIGGER_EV" +
- "ENT_RESPONSE\020\375\\\022\032\n\025TEAM_POS_SAVE_REQUEST" +
- "\020\376\\\022\033\n\026TEAM_POS_SAVE_RESPONSE\020\377\\\022!\n\034TAKE" +
- "_ACTIVITY_REWARD_REQUEST\020\200]\022\"\n\035TAKE_ACTI" +
- "VITY_REWARD_RESPONSE\020\201]\022 \n\033TAKE_MISSION_",
- "REWARD_REQUEST\020\202]\022!\n\034TAKE_MISSION_REWARD" +
- "_RESPONSE\020\203]\022 \n\033TEST_BUY_GIGT_GOODS_REQE" +
- "UST\020\204]\022!\n\034TEST_BUY_GIGT_GOODS_RESPONSE\020\205" +
- "]\022\036\n\031TAKE_TOWER_REWARD_REQUEST\020\206]\022\037\n\032TAK" +
- "E_TOWER_REWARD_RESPONSE\020\207]\022$\n\037TAKE_SEVEN" +
- "_HAPPY_REWARD_REQUEST\020\210]\022%\n TAKE_SEVEN_H" +
- "APPY_REWARD_RESPONSE\020\211]\022\033\n\026TO_BE_STRONGE" +
- "R_REQUEST\020\212]\022\034\n\027TO_BE_STRONGER_RESPONSE\020" +
- "\213]\022 \n\033TREASURE_REFRESH_INDICATION\020\214]\022 \n\033" +
- "TREASURE_LEVELUP_INDICATION\020\215]\022\"\n\035TREASU",
- "RE_REFRESH_TIME_REQUEST\020\216]\022#\n\036TREASURE_R" +
- "EFRESH_TIME_RESPONSE\020\217]\022\032\n\025UP_HERO_LEVEL" +
- "_REQUEST\020\340]\022\033\n\026UP_HERO_LEVEL_RESPONSE\020\341]" +
- "\022\031\n\024UP_HERO_STAR_REQUEST\020\342]\022\032\n\025UP_HERO_S" +
- "TAR_RESPONSE\020\343]\022 \n\033USER_AND_PRICE_ITEM_R" +
- "EQUEST\020\344]\022!\n\034USER_AND_PRICE_ITEM_RESPONS" +
- "E\020\345]\022\036\n\031USER_FORCE_CHANGE_REQUEST\020\346]\022\037\n\032" +
- "USER_FORCE_CHANGE_RESPONSE\020\347]\022\032\n\025UPDATE_" +
- "BAG_INDICATION\020\350]\022\031\n\024UPDATE_STATE_REQUES" +
- "T\020\351]\022\032\n\025UPDATE_STATE_RESPONSE\020\352]\022\037\n\032UPDA",
- "TE_USER_EXP_INDICATION\020\353]\022(\n#UPDATE_SECR" +
- "ET_BOX_SEASON_INDICATION\020\354]\022\036\n\031UPDATE_PH" +
- "ONE_INFO_REQUEST\020\355]\022\037\n\032UPDATE_PHONE_INFO" +
- "_RESPONSE\020\356]\022\034\n\027UPDATE_QUESTION_REQUEST\020" +
- "\357]\022\035\n\030UPDATE_QUESTION_RESPONSE\020\360]\022 \n\033UP_" +
- "SOUL_EQUIP_QUICK_REQUEST\020\362]\022\033\n\026UP_SOUL_E" +
- "QUIP_RESPONSE\020\363]\022\035\n\030VIEW_FIGHTREPLAY_REQ" +
- "UEST\020\304^\022\036\n\031VIEW_FIGHTREPLAY_RESPONSE\020\305^\022" +
- "\030\n\023VIP_LEVELUP_REQEUST\020\306^\022\031\n\024VIP_LEVELUP" +
- "_RESPONSE\020\307^\022\034\n\027VIP_TAKE_REWARD_REQUEST\020",
- "\310^\022\035\n\030VIP_TAKE_REWARD_RESPONSE\020\311^\022\033\n\026VIE" +
- "W_HERO_INFO_REQUEST\020\312^\022\034\n\027VIEW_HERO_INFO" +
- "_RESPONSE\020\313^\022\033\n\026VIP_TAKE_DAILY_REQUEST\020\314" +
- "^\022\034\n\027VIP_TAKE_DAILY_RESPONSE\020\315^\022 \n\033WORKS" +
- "HOP_FOUNDATION_REQUEST\020\250_\022!\n\034WORKSHOP_FO" +
- "UNDATION_RESPONSE\020\251_\022\"\n\035WORKSHOP_EQUIP_C" +
- "REATE_REQUEST\020\252_\022#\n\036WORKSHOP_EQUIP_CREAT" +
- "E_RESPONSE\020\253_\022\035\n\030WORKSHOP_REBUILD_REQUES" +
- "T\020\254_\022\036\n\031WORKSHOP_REBUILD_RESPONSE\020\255_\022%\n " +
- "WORKSHOP_REBUILD_CONFIRM_REQUEST\020\256_\022%\n W",
- "ORKSHOP_REBUILD_CONFIRM_RESONSE\020\257_\022\035\n\030WO" +
- "RKSHOP_LEVELUP_REQUEST\020\260_\022\036\n\031WORKSHOP_LE" +
- "VELUP_RESPONSE\020\261_\022&\n!WORKSHOP_TECHNOLOGY" +
- "_LEVEL_REQUEST\020\262_\022!\n\034WORKSHOP_TECHNOLOGY" +
- "_RESPONSE\020\263_\022&\n!WORKSHOP_TECHNOLOGY_RESE" +
- "T_REQUEST\020\264_\022\'\n\"WORKSHOP_TECHNOLOGY_RESE" +
- "T_RESPONSE\020\265_\022\'\n!EXPEDITION_GET_EXPEDITI" +
- "ON_REQUEST\020\242\234\001\022\'\n!EXPEDITION_GET_EXPEDIT" +
- "ION_RESONSE\020\243\234\001\022\'\n!EXPEDITION_TAKE_BOXRE" +
- "WARD_REQUEST\020\244\234\001\022\'\n!EXPEDITION_TAKE_BOXR",
- "EWARD_RESONSE\020\245\234\001\022$\n\036EXPEDITION_RELIVE_H" +
- "ERO_REQUEST\020\246\234\001\022$\n\036EXPEDITION_RELIVE_HER" +
- "O_RESONSE\020\247\234\001\022%\n\037EXPEDITION_START_BATTLE" +
- "_REQUEST\020\250\234\001\022%\n\037EXPEDITION_START_BATTLE_" +
- "RESONSE\020\251\234\001\022#\n\035EXPEDITION_END_BATTLE_REQ" +
- "UEST\020\252\234\001\022#\n\035EXPEDITION_END_BATTLE_RESONS" +
- "E\020\253\234\001\022(\n\"EXPEDITION_TAKE_HOLY_EQUIP_REQU" +
- "EST\020\254\234\001\022(\n\"EXPEDITION_TAKE_HOLY_EQUIP_RE" +
- "SONSE\020\255\234\001\022%\n\037EXPEDITION_RECOVER_HERO_REQ" +
- "UEST\020\256\234\001\022%\n\037EXPEDITION_RECOVER_HERO_RESO",
- "NSE\020\257\234\001\022$\n\036EXPEDITION_HOLY_BAG_INDICATIO" +
- "N\020\260\234\001\022\"\n\034EXPEDITION_NOINFO_INDICATION\020\261\234" +
- "\001\022\"\n\034MONTHCARD_TAKE_DAILY_REQUEST\020\205\235\001\022#\n" +
- "\035MONTHCARD_TAKE_DAILY_RESPONSE\020\206\235\001\022\032\n\024MO" +
- "NTHCARD_INDICATION\020\207\235\001B\002H\001"
+ "\\\022#\n\036SOUL_FORCE_RAND_EQUIP_RESPONSE\020\276\\\022\027" +
+ "\n\022SOUL_MERGE_REQUEST\020\277\\\022\030\n\023SOUL_MERGE_RE" +
+ "SPONSE\020\300\\\022\032\n\025TRIGGER_EVENT_REQUEST\020\374\\\022\033\n" +
+ "\026TRIGGER_EVENT_RESPONSE\020\375\\\022\032\n\025TEAM_POS_S" +
+ "AVE_REQUEST\020\376\\\022\033\n\026TEAM_POS_SAVE_RESPONSE" +
+ "\020\377\\\022!\n\034TAKE_ACTIVITY_REWARD_REQUEST\020\200]\022\"",
+ "\n\035TAKE_ACTIVITY_REWARD_RESPONSE\020\201]\022 \n\033TA" +
+ "KE_MISSION_REWARD_REQUEST\020\202]\022!\n\034TAKE_MIS" +
+ "SION_REWARD_RESPONSE\020\203]\022 \n\033TEST_BUY_GIGT" +
+ "_GOODS_REQEUST\020\204]\022!\n\034TEST_BUY_GIGT_GOODS" +
+ "_RESPONSE\020\205]\022\036\n\031TAKE_TOWER_REWARD_REQUES" +
+ "T\020\206]\022\037\n\032TAKE_TOWER_REWARD_RESPONSE\020\207]\022$\n" +
+ "\037TAKE_SEVEN_HAPPY_REWARD_REQUEST\020\210]\022%\n T" +
+ "AKE_SEVEN_HAPPY_REWARD_RESPONSE\020\211]\022\033\n\026TO" +
+ "_BE_STRONGER_REQUEST\020\212]\022\034\n\027TO_BE_STRONGE" +
+ "R_RESPONSE\020\213]\022 \n\033TREASURE_REFRESH_INDICA",
+ "TION\020\214]\022 \n\033TREASURE_LEVELUP_INDICATION\020\215" +
+ "]\022\"\n\035TREASURE_REFRESH_TIME_REQUEST\020\216]\022#\n" +
+ "\036TREASURE_REFRESH_TIME_RESPONSE\020\217]\022\032\n\025UP" +
+ "_HERO_LEVEL_REQUEST\020\340]\022\033\n\026UP_HERO_LEVEL_" +
+ "RESPONSE\020\341]\022\031\n\024UP_HERO_STAR_REQUEST\020\342]\022\032" +
+ "\n\025UP_HERO_STAR_RESPONSE\020\343]\022 \n\033USER_AND_P" +
+ "RICE_ITEM_REQUEST\020\344]\022!\n\034USER_AND_PRICE_I" +
+ "TEM_RESPONSE\020\345]\022\036\n\031USER_FORCE_CHANGE_REQ" +
+ "UEST\020\346]\022\037\n\032USER_FORCE_CHANGE_RESPONSE\020\347]" +
+ "\022\032\n\025UPDATE_BAG_INDICATION\020\350]\022\031\n\024UPDATE_S",
+ "TATE_REQUEST\020\351]\022\032\n\025UPDATE_STATE_RESPONSE" +
+ "\020\352]\022\037\n\032UPDATE_USER_EXP_INDICATION\020\353]\022(\n#" +
+ "UPDATE_SECRET_BOX_SEASON_INDICATION\020\354]\022\036" +
+ "\n\031UPDATE_PHONE_INFO_REQUEST\020\355]\022\037\n\032UPDATE" +
+ "_PHONE_INFO_RESPONSE\020\356]\022\034\n\027UPDATE_QUESTI" +
+ "ON_REQUEST\020\357]\022\035\n\030UPDATE_QUESTION_RESPONS" +
+ "E\020\360]\022 \n\033UP_SOUL_EQUIP_QUICK_REQUEST\020\362]\022\033" +
+ "\n\026UP_SOUL_EQUIP_RESPONSE\020\363]\022\035\n\030VIEW_FIGH" +
+ "TREPLAY_REQUEST\020\304^\022\036\n\031VIEW_FIGHTREPLAY_R" +
+ "ESPONSE\020\305^\022\030\n\023VIP_LEVELUP_REQEUST\020\306^\022\031\n\024",
+ "VIP_LEVELUP_RESPONSE\020\307^\022\034\n\027VIP_TAKE_REWA" +
+ "RD_REQUEST\020\310^\022\035\n\030VIP_TAKE_REWARD_RESPONS" +
+ "E\020\311^\022\033\n\026VIEW_HERO_INFO_REQUEST\020\312^\022\034\n\027VIE" +
+ "W_HERO_INFO_RESPONSE\020\313^\022\033\n\026VIP_TAKE_DAIL" +
+ "Y_REQUEST\020\314^\022\034\n\027VIP_TAKE_DAILY_RESPONSE\020" +
+ "\315^\022 \n\033WORKSHOP_FOUNDATION_REQUEST\020\250_\022!\n\034" +
+ "WORKSHOP_FOUNDATION_RESPONSE\020\251_\022\"\n\035WORKS" +
+ "HOP_EQUIP_CREATE_REQUEST\020\252_\022#\n\036WORKSHOP_" +
+ "EQUIP_CREATE_RESPONSE\020\253_\022\035\n\030WORKSHOP_REB" +
+ "UILD_REQUEST\020\254_\022\036\n\031WORKSHOP_REBUILD_RESP",
+ "ONSE\020\255_\022%\n WORKSHOP_REBUILD_CONFIRM_REQU" +
+ "EST\020\256_\022%\n WORKSHOP_REBUILD_CONFIRM_RESON" +
+ "SE\020\257_\022\035\n\030WORKSHOP_LEVELUP_REQUEST\020\260_\022\036\n\031" +
+ "WORKSHOP_LEVELUP_RESPONSE\020\261_\022&\n!WORKSHOP" +
+ "_TECHNOLOGY_LEVEL_REQUEST\020\262_\022!\n\034WORKSHOP" +
+ "_TECHNOLOGY_RESPONSE\020\263_\022&\n!WORKSHOP_TECH" +
+ "NOLOGY_RESET_REQUEST\020\264_\022\'\n\"WORKSHOP_TECH" +
+ "NOLOGY_RESET_RESPONSE\020\265_\022\'\n!EXPEDITION_G" +
+ "ET_EXPEDITION_REQUEST\020\242\234\001\022\'\n!EXPEDITION_" +
+ "GET_EXPEDITION_RESONSE\020\243\234\001\022\'\n!EXPEDITION",
+ "_TAKE_BOXREWARD_REQUEST\020\244\234\001\022\'\n!EXPEDITIO" +
+ "N_TAKE_BOXREWARD_RESONSE\020\245\234\001\022$\n\036EXPEDITI" +
+ "ON_RELIVE_HERO_REQUEST\020\246\234\001\022$\n\036EXPEDITION" +
+ "_RELIVE_HERO_RESONSE\020\247\234\001\022%\n\037EXPEDITION_S" +
+ "TART_BATTLE_REQUEST\020\250\234\001\022%\n\037EXPEDITION_ST" +
+ "ART_BATTLE_RESONSE\020\251\234\001\022#\n\035EXPEDITION_END" +
+ "_BATTLE_REQUEST\020\252\234\001\022#\n\035EXPEDITION_END_BA" +
+ "TTLE_RESONSE\020\253\234\001\022(\n\"EXPEDITION_TAKE_HOLY" +
+ "_EQUIP_REQUEST\020\254\234\001\022(\n\"EXPEDITION_TAKE_HO" +
+ "LY_EQUIP_RESONSE\020\255\234\001\022%\n\037EXPEDITION_RECOV",
+ "ER_HERO_REQUEST\020\256\234\001\022%\n\037EXPEDITION_RECOVE" +
+ "R_HERO_RESONSE\020\257\234\001\022$\n\036EXPEDITION_HOLY_BA" +
+ "G_INDICATION\020\260\234\001\022\"\n\034EXPEDITION_NOINFO_IN" +
+ "DICATION\020\261\234\001\022\"\n\034MONTHCARD_TAKE_DAILY_REQ" +
+ "UEST\020\205\235\001\022#\n\035MONTHCARD_TAKE_DAILY_RESPONS" +
+ "E\020\206\235\001\022\032\n\024MONTHCARD_INDICATION\020\207\235\001B\002H\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
index 127a26155..ca51b200f 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
@@ -114,6 +114,8 @@ public interface BIReason {
int EXPEDITION_BOX_REWARD = 65;//猎妖之路宝箱奖励
int EXPEDITION_DROP_REWARD = 66;//猎妖之路奖励
+ int UNLOAD_SOUL_REWARD = 67;//猎妖之路奖励
+
int ADVENTURE_UPLEVEL_CONSUME = 1000;//秘境升级
int SECRETBOX_CONSUME = 1001;//秘盒抽卡
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/chat/SendChatInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/chat/SendChatInfoHandler.java
index b1adf6a17..d852bf681 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/chat/SendChatInfoHandler.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/chat/SendChatInfoHandler.java
@@ -26,7 +26,7 @@ public class SendChatInfoHandler extends BaseHandler{
int friendId = sendChatInfoReqest.getFriendId();
if(message.startsWith("0|//")&&GameApplication.serverProperties.isDebug()){
- GmService.exeCmd(message.substring(4));
+ // GmService.exeCmd(message.substring(4));
ChatLogic.getInstance().sendChatMessage(iSession,chatType,message+"gm命令",friendId);
}else {
ChatLogic.getInstance().sendChatMessage(iSession,chatType,message,friendId);
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/SoulEquipUnLoadOptHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/SoulEquipUnLoadOptHandler.java
index 5db0b525d..04af5c785 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/SoulEquipUnLoadOptHandler.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/SoulEquipUnLoadOptHandler.java
@@ -22,6 +22,6 @@ public class SoulEquipUnLoadOptHandler extends BaseHandler