From 2596295a30d5d64e314745d4cd608ca85e3a5f06 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 9 Jan 2020 16:43:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=B4=AD=E4=B9=B0=E5=92=8C?= =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/protocols/CommonProto.java | 3750 ++++++++++++++++- .../com/ljsd/jieling/protocols/Family.java | 744 ++-- .../jieling/protocols/FightInfoProto.java | 1210 ++++-- .../jieling/protocols/MessageTypeProto.java | 200 +- .../com/ljsd/jieling/db/redis/RedisKey.java | 1 + .../com/ljsd/jieling/exception/ErrorCode.java | 2 +- .../com/ljsd/jieling/globals/BIReason.java | 3 +- .../ljsd/jieling/handler/map/MapLogic.java | 2 +- .../mapHandler/SweepRightRequestHandler.java | 2 + .../jieling/logic/GlobalDataManaager.java | 21 +- .../jieling/logic/family/GuildFightLogic.java | 33 +- .../jieling/logic/store/BuyGoodsLogic.java | 4 - .../com/ljsd/jieling/util/http/HttpPool.java | 2 +- .../java/config/SGuildBossRewardConfig.java | 6 +- .../java/config/SRechargeCommodityConfig.java | 8 + 15 files changed, 5291 insertions(+), 697 deletions(-) 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 304ef541a..00c939019 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java @@ -82897,6 +82897,24 @@ public final class CommonProto { * */ int getGetCount(); + + // optional int32 redType = 5; + /** + * optional int32 redType = 5; + * + *
+     *红包类型Id,对应表中ID
+     * 
+ */ + boolean hasRedType(); + /** + * optional int32 redType = 5; + * + *
+     *红包类型Id,对应表中ID
+     * 
+ */ + int getRedType(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.RedPackage} @@ -82969,6 +82987,11 @@ public final class CommonProto { getCount_ = input.readInt32(); break; } + case 40: { + bitField0_ |= 0x00000010; + redType_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -83124,11 +83147,36 @@ public final class CommonProto { return getCount_; } + // optional int32 redType = 5; + public static final int REDTYPE_FIELD_NUMBER = 5; + private int redType_; + /** + * optional int32 redType = 5; + * + *
+     *红包类型Id,对应表中ID
+     * 
+ */ + public boolean hasRedType() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional int32 redType = 5; + * + *
+     *红包类型Id,对应表中ID
+     * 
+ */ + public int getRedType() { + return redType_; + } + private void initFields() { userName_ = ""; redId_ = 0; isGet_ = 0; getCount_ = 0; + redType_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -83154,6 +83202,9 @@ public final class CommonProto { if (((bitField0_ & 0x00000008) == 0x00000008)) { output.writeInt32(4, getCount_); } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + output.writeInt32(5, redType_); + } getUnknownFields().writeTo(output); } @@ -83179,6 +83230,10 @@ public final class CommonProto { size += com.google.protobuf.CodedOutputStream .computeInt32Size(4, getCount_); } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(5, redType_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -83303,6 +83358,8 @@ public final class CommonProto { bitField0_ = (bitField0_ & ~0x00000004); getCount_ = 0; bitField0_ = (bitField0_ & ~0x00000008); + redType_ = 0; + bitField0_ = (bitField0_ & ~0x00000010); return this; } @@ -83347,6 +83404,10 @@ public final class CommonProto { to_bitField0_ |= 0x00000008; } result.getCount_ = getCount_; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { + to_bitField0_ |= 0x00000010; + } + result.redType_ = redType_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -83377,6 +83438,9 @@ public final class CommonProto { if (other.hasGetCount()) { setGetCount(other.getGetCount()); } + if (other.hasRedType()) { + setRedType(other.getRedType()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -83625,6 +83689,55 @@ public final class CommonProto { return this; } + // optional int32 redType = 5; + private int redType_ ; + /** + * optional int32 redType = 5; + * + *
+       *红包类型Id,对应表中ID
+       * 
+ */ + public boolean hasRedType() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional int32 redType = 5; + * + *
+       *红包类型Id,对应表中ID
+       * 
+ */ + public int getRedType() { + return redType_; + } + /** + * optional int32 redType = 5; + * + *
+       *红包类型Id,对应表中ID
+       * 
+ */ + public Builder setRedType(int value) { + bitField0_ |= 0x00000010; + redType_ = value; + onChanged(); + return this; + } + /** + * optional int32 redType = 5; + * + *
+       *红包类型Id,对应表中ID
+       * 
+ */ + public Builder clearRedType() { + bitField0_ = (bitField0_ & ~0x00000010); + redType_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.RedPackage) } @@ -83703,6 +83816,16 @@ public final class CommonProto { * optional int32 count = 6; */ int getCount(); + + // optional int32 itemId = 7; + /** + * optional int32 itemId = 7; + */ + boolean hasItemId(); + /** + * optional int32 itemId = 7; + */ + int getItemId(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.RedOneDetail} @@ -83785,6 +83908,11 @@ public final class CommonProto { count_ = input.readInt32(); break; } + case 56: { + bitField0_ |= 0x00000040; + itemId_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -83948,6 +84076,22 @@ public final class CommonProto { return count_; } + // optional int32 itemId = 7; + public static final int ITEMID_FIELD_NUMBER = 7; + private int itemId_; + /** + * optional int32 itemId = 7; + */ + public boolean hasItemId() { + return ((bitField0_ & 0x00000040) == 0x00000040); + } + /** + * optional int32 itemId = 7; + */ + public int getItemId() { + return itemId_; + } + private void initFields() { uid_ = 0; head_ = 0; @@ -83955,6 +84099,7 @@ public final class CommonProto { name_ = ""; time_ = 0; count_ = 0; + itemId_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -83986,6 +84131,9 @@ public final class CommonProto { if (((bitField0_ & 0x00000020) == 0x00000020)) { output.writeInt32(6, count_); } + if (((bitField0_ & 0x00000040) == 0x00000040)) { + output.writeInt32(7, itemId_); + } getUnknownFields().writeTo(output); } @@ -84019,6 +84167,10 @@ public final class CommonProto { size += com.google.protobuf.CodedOutputStream .computeInt32Size(6, count_); } + if (((bitField0_ & 0x00000040) == 0x00000040)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(7, itemId_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -84147,6 +84299,8 @@ public final class CommonProto { bitField0_ = (bitField0_ & ~0x00000010); count_ = 0; bitField0_ = (bitField0_ & ~0x00000020); + itemId_ = 0; + bitField0_ = (bitField0_ & ~0x00000040); return this; } @@ -84199,6 +84353,10 @@ public final class CommonProto { to_bitField0_ |= 0x00000020; } result.count_ = count_; + if (((from_bitField0_ & 0x00000040) == 0x00000040)) { + to_bitField0_ |= 0x00000040; + } + result.itemId_ = itemId_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -84235,6 +84393,9 @@ public final class CommonProto { if (other.hasCount()) { setCount(other.getCount()); } + if (other.hasItemId()) { + setItemId(other.getItemId()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -84501,6 +84662,39 @@ public final class CommonProto { return this; } + // optional int32 itemId = 7; + private int itemId_ ; + /** + * optional int32 itemId = 7; + */ + public boolean hasItemId() { + return ((bitField0_ & 0x00000040) == 0x00000040); + } + /** + * optional int32 itemId = 7; + */ + public int getItemId() { + return itemId_; + } + /** + * optional int32 itemId = 7; + */ + public Builder setItemId(int value) { + bitField0_ |= 0x00000040; + itemId_ = value; + onChanged(); + return this; + } + /** + * optional int32 itemId = 7; + */ + public Builder clearItemId() { + bitField0_ = (bitField0_ & ~0x00000040); + itemId_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.RedOneDetail) } @@ -84512,6 +84706,3492 @@ public final class CommonProto { // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.RedOneDetail) } + public interface ExpeditionNodeInfoOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional int32 sortId = 1; + /** + * optional int32 sortId = 1; + * + *
+     *节点id
+     * 
+ */ + boolean hasSortId(); + /** + * optional int32 sortId = 1; + * + *
+     *节点id
+     * 
+ */ + int getSortId(); + + // optional int32 lay = 2; + /** + * optional int32 lay = 2; + * + *
+     *节点层
+     * 
+ */ + boolean hasLay(); + /** + * optional int32 lay = 2; + * + *
+     *节点层
+     * 
+ */ + int getLay(); + + // optional int32 type = 3; + /** + * optional int32 type = 3; + * + *
+     *节点类型
+     * 
+ */ + boolean hasType(); + /** + * optional int32 type = 3; + * + *
+     *节点类型
+     * 
+ */ + int getType(); + + // optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+     *节点队伍信息
+     * 
+ */ + boolean hasBossTeaminfo(); + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+     *节点队伍信息
+     * 
+ */ + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo getBossTeaminfo(); + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+     *节点队伍信息
+     * 
+ */ + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder getBossTeaminfoOrBuilder(); + + // optional int32 state = 5; + /** + * optional int32 state = 5; + * + *
+     *//节点状态 0未开启 1未通过 2未领取圣物 3已完成
+     * 
+ */ + boolean hasState(); + /** + * optional int32 state = 5; + * + *
+     *//节点状态 0未开启 1未通过 2未领取圣物 3已完成
+     * 
+ */ + int getState(); + + // repeated int32 holyEquipID = 6; + /** + * repeated int32 holyEquipID = 6; + * + *
+     *圣物id
+     * 
+ */ + java.util.List getHolyEquipIDList(); + /** + * repeated int32 holyEquipID = 6; + * + *
+     *圣物id
+     * 
+ */ + int getHolyEquipIDCount(); + /** + * repeated int32 holyEquipID = 6; + * + *
+     *圣物id
+     * 
+ */ + int getHolyEquipID(int index); + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ExpeditionNodeInfo} + * + *
+   *猎妖之路节点信息
+   * 
+ */ + public static final class ExpeditionNodeInfo extends + com.google.protobuf.GeneratedMessage + implements ExpeditionNodeInfoOrBuilder { + // Use ExpeditionNodeInfo.newBuilder() to construct. + private ExpeditionNodeInfo(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private ExpeditionNodeInfo(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final ExpeditionNodeInfo defaultInstance; + public static ExpeditionNodeInfo getDefaultInstance() { + return defaultInstance; + } + + public ExpeditionNodeInfo getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ExpeditionNodeInfo( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + sortId_ = input.readInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + lay_ = input.readInt32(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + type_ = input.readInt32(); + break; + } + case 34: { + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder subBuilder = null; + if (((bitField0_ & 0x00000008) == 0x00000008)) { + subBuilder = bossTeaminfo_.toBuilder(); + } + bossTeaminfo_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(bossTeaminfo_); + bossTeaminfo_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000008; + break; + } + case 40: { + bitField0_ |= 0x00000010; + state_ = input.readInt32(); + break; + } + case 48: { + if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + holyEquipID_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000020; + } + holyEquipID_.add(input.readInt32()); + break; + } + case 50: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000020) == 0x00000020) && input.getBytesUntilLimit() > 0) { + holyEquipID_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000020; + } + while (input.getBytesUntilLimit() > 0) { + holyEquipID_.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_ & 0x00000020) == 0x00000020)) { + holyEquipID_ = java.util.Collections.unmodifiableList(holyEquipID_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo.class, com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public ExpeditionNodeInfo parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ExpeditionNodeInfo(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional int32 sortId = 1; + public static final int SORTID_FIELD_NUMBER = 1; + private int sortId_; + /** + * optional int32 sortId = 1; + * + *
+     *节点id
+     * 
+ */ + public boolean hasSortId() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 sortId = 1; + * + *
+     *节点id
+     * 
+ */ + public int getSortId() { + return sortId_; + } + + // optional int32 lay = 2; + public static final int LAY_FIELD_NUMBER = 2; + private int lay_; + /** + * optional int32 lay = 2; + * + *
+     *节点层
+     * 
+ */ + public boolean hasLay() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 lay = 2; + * + *
+     *节点层
+     * 
+ */ + public int getLay() { + return lay_; + } + + // optional int32 type = 3; + public static final int TYPE_FIELD_NUMBER = 3; + private int type_; + /** + * optional int32 type = 3; + * + *
+     *节点类型
+     * 
+ */ + public boolean hasType() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 type = 3; + * + *
+     *节点类型
+     * 
+ */ + public int getType() { + return type_; + } + + // optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + public static final int BOSSTEAMINFO_FIELD_NUMBER = 4; + private com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo bossTeaminfo_; + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+     *节点队伍信息
+     * 
+ */ + public boolean hasBossTeaminfo() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+     *节点队伍信息
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo getBossTeaminfo() { + return bossTeaminfo_; + } + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+     *节点队伍信息
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder getBossTeaminfoOrBuilder() { + return bossTeaminfo_; + } + + // optional int32 state = 5; + public static final int STATE_FIELD_NUMBER = 5; + private int state_; + /** + * optional int32 state = 5; + * + *
+     *//节点状态 0未开启 1未通过 2未领取圣物 3已完成
+     * 
+ */ + public boolean hasState() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional int32 state = 5; + * + *
+     *//节点状态 0未开启 1未通过 2未领取圣物 3已完成
+     * 
+ */ + public int getState() { + return state_; + } + + // repeated int32 holyEquipID = 6; + public static final int HOLYEQUIPID_FIELD_NUMBER = 6; + private java.util.List holyEquipID_; + /** + * repeated int32 holyEquipID = 6; + * + *
+     *圣物id
+     * 
+ */ + public java.util.List + getHolyEquipIDList() { + return holyEquipID_; + } + /** + * repeated int32 holyEquipID = 6; + * + *
+     *圣物id
+     * 
+ */ + public int getHolyEquipIDCount() { + return holyEquipID_.size(); + } + /** + * repeated int32 holyEquipID = 6; + * + *
+     *圣物id
+     * 
+ */ + public int getHolyEquipID(int index) { + return holyEquipID_.get(index); + } + + private void initFields() { + sortId_ = 0; + lay_ = 0; + type_ = 0; + bossTeaminfo_ = com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance(); + state_ = 0; + holyEquipID_ = java.util.Collections.emptyList(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeInt32(1, sortId_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(2, lay_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeInt32(3, type_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeMessage(4, bossTeaminfo_); + } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + output.writeInt32(5, state_); + } + for (int i = 0; i < holyEquipID_.size(); i++) { + output.writeInt32(6, holyEquipID_.get(i)); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, sortId_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, lay_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, type_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, bossTeaminfo_); + } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(5, state_); + } + { + int dataSize = 0; + for (int i = 0; i < holyEquipID_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(holyEquipID_.get(i)); + } + size += dataSize; + size += 1 * getHolyEquipIDList().size(); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ExpeditionNodeInfo} + * + *
+     *猎妖之路节点信息
+     * 
+ */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfoOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo.class, com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo.Builder.class); + } + + // Construct using com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getBossTeaminfoFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + sortId_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + lay_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + type_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); + if (bossTeaminfoBuilder_ == null) { + bossTeaminfo_ = com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance(); + } else { + bossTeaminfoBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000008); + state_ = 0; + bitField0_ = (bitField0_ & ~0x00000010); + holyEquipID_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000020); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_descriptor; + } + + public com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo.getDefaultInstance(); + } + + public com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo build() { + com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo buildPartial() { + com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo result = new com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.sortId_ = sortId_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.lay_ = lay_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.type_ = type_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + if (bossTeaminfoBuilder_ == null) { + result.bossTeaminfo_ = bossTeaminfo_; + } else { + result.bossTeaminfo_ = bossTeaminfoBuilder_.build(); + } + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { + to_bitField0_ |= 0x00000010; + } + result.state_ = state_; + if (((bitField0_ & 0x00000020) == 0x00000020)) { + holyEquipID_ = java.util.Collections.unmodifiableList(holyEquipID_); + bitField0_ = (bitField0_ & ~0x00000020); + } + result.holyEquipID_ = holyEquipID_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo) { + return mergeFrom((com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo other) { + if (other == com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo.getDefaultInstance()) return this; + if (other.hasSortId()) { + setSortId(other.getSortId()); + } + if (other.hasLay()) { + setLay(other.getLay()); + } + if (other.hasType()) { + setType(other.getType()); + } + if (other.hasBossTeaminfo()) { + mergeBossTeaminfo(other.getBossTeaminfo()); + } + if (other.hasState()) { + setState(other.getState()); + } + if (!other.holyEquipID_.isEmpty()) { + if (holyEquipID_.isEmpty()) { + holyEquipID_ = other.holyEquipID_; + bitField0_ = (bitField0_ & ~0x00000020); + } else { + ensureHolyEquipIDIsMutable(); + holyEquipID_.addAll(other.holyEquipID_); + } + 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.CommonProto.ExpeditionNodeInfo parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.ljsd.jieling.protocols.CommonProto.ExpeditionNodeInfo) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional int32 sortId = 1; + private int sortId_ ; + /** + * optional int32 sortId = 1; + * + *
+       *节点id
+       * 
+ */ + public boolean hasSortId() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 sortId = 1; + * + *
+       *节点id
+       * 
+ */ + public int getSortId() { + return sortId_; + } + /** + * optional int32 sortId = 1; + * + *
+       *节点id
+       * 
+ */ + public Builder setSortId(int value) { + bitField0_ |= 0x00000001; + sortId_ = value; + onChanged(); + return this; + } + /** + * optional int32 sortId = 1; + * + *
+       *节点id
+       * 
+ */ + public Builder clearSortId() { + bitField0_ = (bitField0_ & ~0x00000001); + sortId_ = 0; + onChanged(); + return this; + } + + // optional int32 lay = 2; + private int lay_ ; + /** + * optional int32 lay = 2; + * + *
+       *节点层
+       * 
+ */ + public boolean hasLay() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 lay = 2; + * + *
+       *节点层
+       * 
+ */ + public int getLay() { + return lay_; + } + /** + * optional int32 lay = 2; + * + *
+       *节点层
+       * 
+ */ + public Builder setLay(int value) { + bitField0_ |= 0x00000002; + lay_ = value; + onChanged(); + return this; + } + /** + * optional int32 lay = 2; + * + *
+       *节点层
+       * 
+ */ + public Builder clearLay() { + bitField0_ = (bitField0_ & ~0x00000002); + lay_ = 0; + onChanged(); + return this; + } + + // optional int32 type = 3; + private int type_ ; + /** + * optional int32 type = 3; + * + *
+       *节点类型
+       * 
+ */ + public boolean hasType() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 type = 3; + * + *
+       *节点类型
+       * 
+ */ + public int getType() { + return type_; + } + /** + * optional int32 type = 3; + * + *
+       *节点类型
+       * 
+ */ + public Builder setType(int value) { + bitField0_ |= 0x00000004; + type_ = value; + onChanged(); + return this; + } + /** + * optional int32 type = 3; + * + *
+       *节点类型
+       * 
+ */ + public Builder clearType() { + bitField0_ = (bitField0_ & ~0x00000004); + type_ = 0; + onChanged(); + return this; + } + + // optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + private com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo bossTeaminfo_ = com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder> bossTeaminfoBuilder_; + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+       *节点队伍信息
+       * 
+ */ + public boolean hasBossTeaminfo() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+       *节点队伍信息
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo getBossTeaminfo() { + if (bossTeaminfoBuilder_ == null) { + return bossTeaminfo_; + } else { + return bossTeaminfoBuilder_.getMessage(); + } + } + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+       *节点队伍信息
+       * 
+ */ + public Builder setBossTeaminfo(com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo value) { + if (bossTeaminfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + bossTeaminfo_ = value; + onChanged(); + } else { + bossTeaminfoBuilder_.setMessage(value); + } + bitField0_ |= 0x00000008; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+       *节点队伍信息
+       * 
+ */ + public Builder setBossTeaminfo( + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder builderForValue) { + if (bossTeaminfoBuilder_ == null) { + bossTeaminfo_ = builderForValue.build(); + onChanged(); + } else { + bossTeaminfoBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000008; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+       *节点队伍信息
+       * 
+ */ + public Builder mergeBossTeaminfo(com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo value) { + if (bossTeaminfoBuilder_ == null) { + if (((bitField0_ & 0x00000008) == 0x00000008) && + bossTeaminfo_ != com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance()) { + bossTeaminfo_ = + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.newBuilder(bossTeaminfo_).mergeFrom(value).buildPartial(); + } else { + bossTeaminfo_ = value; + } + onChanged(); + } else { + bossTeaminfoBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000008; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+       *节点队伍信息
+       * 
+ */ + public Builder clearBossTeaminfo() { + if (bossTeaminfoBuilder_ == null) { + bossTeaminfo_ = com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance(); + onChanged(); + } else { + bossTeaminfoBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000008); + return this; + } + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+       *节点队伍信息
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder getBossTeaminfoBuilder() { + bitField0_ |= 0x00000008; + onChanged(); + return getBossTeaminfoFieldBuilder().getBuilder(); + } + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+       *节点队伍信息
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder getBossTeaminfoOrBuilder() { + if (bossTeaminfoBuilder_ != null) { + return bossTeaminfoBuilder_.getMessageOrBuilder(); + } else { + return bossTeaminfo_; + } + } + /** + * optional .com.ljsd.jieling.protocols.ExpeditionTeamInfo bossTeaminfo = 4; + * + *
+       *节点队伍信息
+       * 
+ */ + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder> + getBossTeaminfoFieldBuilder() { + if (bossTeaminfoBuilder_ == null) { + bossTeaminfoBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder>( + bossTeaminfo_, + getParentForChildren(), + isClean()); + bossTeaminfo_ = null; + } + return bossTeaminfoBuilder_; + } + + // optional int32 state = 5; + private int state_ ; + /** + * optional int32 state = 5; + * + *
+       *//节点状态 0未开启 1未通过 2未领取圣物 3已完成
+       * 
+ */ + public boolean hasState() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional int32 state = 5; + * + *
+       *//节点状态 0未开启 1未通过 2未领取圣物 3已完成
+       * 
+ */ + public int getState() { + return state_; + } + /** + * optional int32 state = 5; + * + *
+       *//节点状态 0未开启 1未通过 2未领取圣物 3已完成
+       * 
+ */ + public Builder setState(int value) { + bitField0_ |= 0x00000010; + state_ = value; + onChanged(); + return this; + } + /** + * optional int32 state = 5; + * + *
+       *//节点状态 0未开启 1未通过 2未领取圣物 3已完成
+       * 
+ */ + public Builder clearState() { + bitField0_ = (bitField0_ & ~0x00000010); + state_ = 0; + onChanged(); + return this; + } + + // repeated int32 holyEquipID = 6; + private java.util.List holyEquipID_ = java.util.Collections.emptyList(); + private void ensureHolyEquipIDIsMutable() { + if (!((bitField0_ & 0x00000020) == 0x00000020)) { + holyEquipID_ = new java.util.ArrayList(holyEquipID_); + bitField0_ |= 0x00000020; + } + } + /** + * repeated int32 holyEquipID = 6; + * + *
+       *圣物id
+       * 
+ */ + public java.util.List + getHolyEquipIDList() { + return java.util.Collections.unmodifiableList(holyEquipID_); + } + /** + * repeated int32 holyEquipID = 6; + * + *
+       *圣物id
+       * 
+ */ + public int getHolyEquipIDCount() { + return holyEquipID_.size(); + } + /** + * repeated int32 holyEquipID = 6; + * + *
+       *圣物id
+       * 
+ */ + public int getHolyEquipID(int index) { + return holyEquipID_.get(index); + } + /** + * repeated int32 holyEquipID = 6; + * + *
+       *圣物id
+       * 
+ */ + public Builder setHolyEquipID( + int index, int value) { + ensureHolyEquipIDIsMutable(); + holyEquipID_.set(index, value); + onChanged(); + return this; + } + /** + * repeated int32 holyEquipID = 6; + * + *
+       *圣物id
+       * 
+ */ + public Builder addHolyEquipID(int value) { + ensureHolyEquipIDIsMutable(); + holyEquipID_.add(value); + onChanged(); + return this; + } + /** + * repeated int32 holyEquipID = 6; + * + *
+       *圣物id
+       * 
+ */ + public Builder addAllHolyEquipID( + java.lang.Iterable values) { + ensureHolyEquipIDIsMutable(); + super.addAll(values, holyEquipID_); + onChanged(); + return this; + } + /** + * repeated int32 holyEquipID = 6; + * + *
+       *圣物id
+       * 
+ */ + public Builder clearHolyEquipID() { + holyEquipID_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000020); + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ExpeditionNodeInfo) + } + + static { + defaultInstance = new ExpeditionNodeInfo(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ExpeditionNodeInfo) + } + + public interface ExpeditionSimpleBossInfoOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional int32 heroTid = 1; + /** + * optional int32 heroTid = 1; + * + *
+     *英雄模板id
+     * 
+ */ + boolean hasHeroTid(); + /** + * optional int32 heroTid = 1; + * + *
+     *英雄模板id
+     * 
+ */ + int getHeroTid(); + + // optional int32 star = 2; + /** + * optional int32 star = 2; + */ + boolean hasStar(); + /** + * optional int32 star = 2; + */ + int getStar(); + + // optional int32 level = 3; + /** + * optional int32 level = 3; + */ + boolean hasLevel(); + /** + * optional int32 level = 3; + */ + int getLevel(); + + // optional int32 remainHp = 4; + /** + * optional int32 remainHp = 4; + * + *
+     *剩余血量
+     * 
+ */ + boolean hasRemainHp(); + /** + * optional int32 remainHp = 4; + * + *
+     *剩余血量
+     * 
+ */ + int getRemainHp(); + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo} + */ + public static final class ExpeditionSimpleBossInfo extends + com.google.protobuf.GeneratedMessage + implements ExpeditionSimpleBossInfoOrBuilder { + // Use ExpeditionSimpleBossInfo.newBuilder() to construct. + private ExpeditionSimpleBossInfo(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private ExpeditionSimpleBossInfo(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final ExpeditionSimpleBossInfo defaultInstance; + public static ExpeditionSimpleBossInfo getDefaultInstance() { + return defaultInstance; + } + + public ExpeditionSimpleBossInfo getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ExpeditionSimpleBossInfo( + 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; + heroTid_ = input.readInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + star_ = input.readInt32(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + level_ = input.readInt32(); + break; + } + case 32: { + bitField0_ |= 0x00000008; + remainHp_ = input.readInt32(); + 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.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleBossInfo_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleBossInfo_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.class, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public ExpeditionSimpleBossInfo parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ExpeditionSimpleBossInfo(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional int32 heroTid = 1; + public static final int HEROTID_FIELD_NUMBER = 1; + private int heroTid_; + /** + * optional int32 heroTid = 1; + * + *
+     *英雄模板id
+     * 
+ */ + public boolean hasHeroTid() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 heroTid = 1; + * + *
+     *英雄模板id
+     * 
+ */ + public int getHeroTid() { + return heroTid_; + } + + // optional int32 star = 2; + public static final int STAR_FIELD_NUMBER = 2; + private int star_; + /** + * optional int32 star = 2; + */ + public boolean hasStar() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 star = 2; + */ + public int getStar() { + return star_; + } + + // optional int32 level = 3; + public static final int LEVEL_FIELD_NUMBER = 3; + private int level_; + /** + * optional int32 level = 3; + */ + public boolean hasLevel() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 level = 3; + */ + public int getLevel() { + return level_; + } + + // optional int32 remainHp = 4; + public static final int REMAINHP_FIELD_NUMBER = 4; + private int remainHp_; + /** + * optional int32 remainHp = 4; + * + *
+     *剩余血量
+     * 
+ */ + public boolean hasRemainHp() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional int32 remainHp = 4; + * + *
+     *剩余血量
+     * 
+ */ + public int getRemainHp() { + return remainHp_; + } + + private void initFields() { + heroTid_ = 0; + star_ = 0; + level_ = 0; + remainHp_ = 0; + } + 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, heroTid_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(2, star_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeInt32(3, level_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeInt32(4, remainHp_); + } + 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, heroTid_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, star_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, level_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(4, remainHp_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo 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.ExpeditionSimpleBossInfo} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfoOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleBossInfo_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleBossInfo_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.class, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.Builder.class); + } + + // Construct using com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.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(); + heroTid_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + star_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + level_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); + remainHp_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleBossInfo_descriptor; + } + + public com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.getDefaultInstance(); + } + + public com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo build() { + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo buildPartial() { + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo result = new com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.heroTid_ = heroTid_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.star_ = star_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.level_ = level_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + result.remainHp_ = remainHp_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo) { + return mergeFrom((com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo other) { + if (other == com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.getDefaultInstance()) return this; + if (other.hasHeroTid()) { + setHeroTid(other.getHeroTid()); + } + if (other.hasStar()) { + setStar(other.getStar()); + } + if (other.hasLevel()) { + setLevel(other.getLevel()); + } + if (other.hasRemainHp()) { + setRemainHp(other.getRemainHp()); + } + 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.CommonProto.ExpeditionSimpleBossInfo parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional int32 heroTid = 1; + private int heroTid_ ; + /** + * optional int32 heroTid = 1; + * + *
+       *英雄模板id
+       * 
+ */ + public boolean hasHeroTid() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 heroTid = 1; + * + *
+       *英雄模板id
+       * 
+ */ + public int getHeroTid() { + return heroTid_; + } + /** + * optional int32 heroTid = 1; + * + *
+       *英雄模板id
+       * 
+ */ + public Builder setHeroTid(int value) { + bitField0_ |= 0x00000001; + heroTid_ = value; + onChanged(); + return this; + } + /** + * optional int32 heroTid = 1; + * + *
+       *英雄模板id
+       * 
+ */ + public Builder clearHeroTid() { + bitField0_ = (bitField0_ & ~0x00000001); + heroTid_ = 0; + onChanged(); + return this; + } + + // optional int32 star = 2; + private int star_ ; + /** + * optional int32 star = 2; + */ + public boolean hasStar() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 star = 2; + */ + public int getStar() { + return star_; + } + /** + * optional int32 star = 2; + */ + public Builder setStar(int value) { + bitField0_ |= 0x00000002; + star_ = value; + onChanged(); + return this; + } + /** + * optional int32 star = 2; + */ + public Builder clearStar() { + bitField0_ = (bitField0_ & ~0x00000002); + star_ = 0; + onChanged(); + return this; + } + + // optional int32 level = 3; + private int level_ ; + /** + * optional int32 level = 3; + */ + public boolean hasLevel() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 level = 3; + */ + public int getLevel() { + return level_; + } + /** + * optional int32 level = 3; + */ + public Builder setLevel(int value) { + bitField0_ |= 0x00000004; + level_ = value; + onChanged(); + return this; + } + /** + * optional int32 level = 3; + */ + public Builder clearLevel() { + bitField0_ = (bitField0_ & ~0x00000004); + level_ = 0; + onChanged(); + return this; + } + + // optional int32 remainHp = 4; + private int remainHp_ ; + /** + * optional int32 remainHp = 4; + * + *
+       *剩余血量
+       * 
+ */ + public boolean hasRemainHp() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional int32 remainHp = 4; + * + *
+       *剩余血量
+       * 
+ */ + public int getRemainHp() { + return remainHp_; + } + /** + * optional int32 remainHp = 4; + * + *
+       *剩余血量
+       * 
+ */ + public Builder setRemainHp(int value) { + bitField0_ |= 0x00000008; + remainHp_ = value; + onChanged(); + return this; + } + /** + * optional int32 remainHp = 4; + * + *
+       *剩余血量
+       * 
+ */ + public Builder clearRemainHp() { + bitField0_ = (bitField0_ & ~0x00000008); + remainHp_ = 0; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo) + } + + static { + defaultInstance = new ExpeditionSimpleBossInfo(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo) + } + + public interface ExpeditionTeamInfoOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + java.util.List + getHeroList(); + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo getHero(int index); + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + int getHeroCount(); + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + java.util.List + getHeroOrBuilderList(); + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfoOrBuilder getHeroOrBuilder( + int index); + + // repeated int32 PokemonInfos = 2; + /** + * repeated int32 PokemonInfos = 2; + */ + java.util.List getPokemonInfosList(); + /** + * repeated int32 PokemonInfos = 2; + */ + int getPokemonInfosCount(); + /** + * repeated int32 PokemonInfos = 2; + */ + int getPokemonInfos(int index); + + // optional int32 totalForce = 3; + /** + * optional int32 totalForce = 3; + */ + boolean hasTotalForce(); + /** + * optional int32 totalForce = 3; + */ + int getTotalForce(); + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ExpeditionTeamInfo} + */ + public static final class ExpeditionTeamInfo extends + com.google.protobuf.GeneratedMessage + implements ExpeditionTeamInfoOrBuilder { + // Use ExpeditionTeamInfo.newBuilder() to construct. + private ExpeditionTeamInfo(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private ExpeditionTeamInfo(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final ExpeditionTeamInfo defaultInstance; + public static ExpeditionTeamInfo getDefaultInstance() { + return defaultInstance; + } + + public ExpeditionTeamInfo getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ExpeditionTeamInfo( + 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: { + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + hero_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + hero_.add(input.readMessage(com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.PARSER, extensionRegistry)); + break; + } + case 16: { + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + pokemonInfos_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + pokemonInfos_.add(input.readInt32()); + break; + } + case 18: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) && input.getBytesUntilLimit() > 0) { + pokemonInfos_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + while (input.getBytesUntilLimit() > 0) { + pokemonInfos_.add(input.readInt32()); + } + input.popLimit(limit); + break; + } + case 24: { + bitField0_ |= 0x00000001; + totalForce_ = input.readInt32(); + 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_ & 0x00000001) == 0x00000001)) { + hero_ = java.util.Collections.unmodifiableList(hero_); + } + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + pokemonInfos_ = java.util.Collections.unmodifiableList(pokemonInfos_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionTeamInfo_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionTeamInfo_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.class, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public ExpeditionTeamInfo parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ExpeditionTeamInfo(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + public static final int HERO_FIELD_NUMBER = 1; + private java.util.List hero_; + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public java.util.List getHeroList() { + return hero_; + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public java.util.List + getHeroOrBuilderList() { + return hero_; + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public int getHeroCount() { + return hero_.size(); + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo getHero(int index) { + return hero_.get(index); + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfoOrBuilder getHeroOrBuilder( + int index) { + return hero_.get(index); + } + + // repeated int32 PokemonInfos = 2; + public static final int POKEMONINFOS_FIELD_NUMBER = 2; + private java.util.List pokemonInfos_; + /** + * repeated int32 PokemonInfos = 2; + */ + public java.util.List + getPokemonInfosList() { + return pokemonInfos_; + } + /** + * repeated int32 PokemonInfos = 2; + */ + public int getPokemonInfosCount() { + return pokemonInfos_.size(); + } + /** + * repeated int32 PokemonInfos = 2; + */ + public int getPokemonInfos(int index) { + return pokemonInfos_.get(index); + } + + // optional int32 totalForce = 3; + public static final int TOTALFORCE_FIELD_NUMBER = 3; + private int totalForce_; + /** + * optional int32 totalForce = 3; + */ + public boolean hasTotalForce() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 totalForce = 3; + */ + public int getTotalForce() { + return totalForce_; + } + + private void initFields() { + hero_ = java.util.Collections.emptyList(); + pokemonInfos_ = java.util.Collections.emptyList(); + totalForce_ = 0; + } + 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(); + for (int i = 0; i < hero_.size(); i++) { + output.writeMessage(1, hero_.get(i)); + } + for (int i = 0; i < pokemonInfos_.size(); i++) { + output.writeInt32(2, pokemonInfos_.get(i)); + } + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeInt32(3, totalForce_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < hero_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, hero_.get(i)); + } + { + int dataSize = 0; + for (int i = 0; i < pokemonInfos_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(pokemonInfos_.get(i)); + } + size += dataSize; + size += 1 * getPokemonInfosList().size(); + } + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, totalForce_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo 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.ExpeditionTeamInfo} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfoOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionTeamInfo_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionTeamInfo_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.class, com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.Builder.class); + } + + // Construct using com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getHeroFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + if (heroBuilder_ == null) { + hero_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + heroBuilder_.clear(); + } + pokemonInfos_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + totalForce_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionTeamInfo_descriptor; + } + + public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance(); + } + + public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo build() { + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo buildPartial() { + com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo result = new com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (heroBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { + hero_ = java.util.Collections.unmodifiableList(hero_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.hero_ = hero_; + } else { + result.hero_ = heroBuilder_.build(); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + pokemonInfos_ = java.util.Collections.unmodifiableList(pokemonInfos_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.pokemonInfos_ = pokemonInfos_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000001; + } + result.totalForce_ = totalForce_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo) { + return mergeFrom((com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo other) { + if (other == com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo.getDefaultInstance()) return this; + if (heroBuilder_ == null) { + if (!other.hero_.isEmpty()) { + if (hero_.isEmpty()) { + hero_ = other.hero_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureHeroIsMutable(); + hero_.addAll(other.hero_); + } + onChanged(); + } + } else { + if (!other.hero_.isEmpty()) { + if (heroBuilder_.isEmpty()) { + heroBuilder_.dispose(); + heroBuilder_ = null; + hero_ = other.hero_; + bitField0_ = (bitField0_ & ~0x00000001); + heroBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getHeroFieldBuilder() : null; + } else { + heroBuilder_.addAllMessages(other.hero_); + } + } + } + if (!other.pokemonInfos_.isEmpty()) { + if (pokemonInfos_.isEmpty()) { + pokemonInfos_ = other.pokemonInfos_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensurePokemonInfosIsMutable(); + pokemonInfos_.addAll(other.pokemonInfos_); + } + onChanged(); + } + if (other.hasTotalForce()) { + setTotalForce(other.getTotalForce()); + } + 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.CommonProto.ExpeditionTeamInfo parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.ljsd.jieling.protocols.CommonProto.ExpeditionTeamInfo) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + private java.util.List hero_ = + java.util.Collections.emptyList(); + private void ensureHeroIsMutable() { + if (!((bitField0_ & 0x00000001) == 0x00000001)) { + hero_ = new java.util.ArrayList(hero_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.Builder, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfoOrBuilder> heroBuilder_; + + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public java.util.List getHeroList() { + if (heroBuilder_ == null) { + return java.util.Collections.unmodifiableList(hero_); + } else { + return heroBuilder_.getMessageList(); + } + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public int getHeroCount() { + if (heroBuilder_ == null) { + return hero_.size(); + } else { + return heroBuilder_.getCount(); + } + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo getHero(int index) { + if (heroBuilder_ == null) { + return hero_.get(index); + } else { + return heroBuilder_.getMessage(index); + } + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public Builder setHero( + int index, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo value) { + if (heroBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureHeroIsMutable(); + hero_.set(index, value); + onChanged(); + } else { + heroBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public Builder setHero( + int index, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.Builder builderForValue) { + if (heroBuilder_ == null) { + ensureHeroIsMutable(); + hero_.set(index, builderForValue.build()); + onChanged(); + } else { + heroBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public Builder addHero(com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo value) { + if (heroBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureHeroIsMutable(); + hero_.add(value); + onChanged(); + } else { + heroBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public Builder addHero( + int index, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo value) { + if (heroBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureHeroIsMutable(); + hero_.add(index, value); + onChanged(); + } else { + heroBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public Builder addHero( + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.Builder builderForValue) { + if (heroBuilder_ == null) { + ensureHeroIsMutable(); + hero_.add(builderForValue.build()); + onChanged(); + } else { + heroBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public Builder addHero( + int index, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.Builder builderForValue) { + if (heroBuilder_ == null) { + ensureHeroIsMutable(); + hero_.add(index, builderForValue.build()); + onChanged(); + } else { + heroBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public Builder addAllHero( + java.lang.Iterable values) { + if (heroBuilder_ == null) { + ensureHeroIsMutable(); + super.addAll(values, hero_); + onChanged(); + } else { + heroBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public Builder clearHero() { + if (heroBuilder_ == null) { + hero_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + heroBuilder_.clear(); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public Builder removeHero(int index) { + if (heroBuilder_ == null) { + ensureHeroIsMutable(); + hero_.remove(index); + onChanged(); + } else { + heroBuilder_.remove(index); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.Builder getHeroBuilder( + int index) { + return getHeroFieldBuilder().getBuilder(index); + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfoOrBuilder getHeroOrBuilder( + int index) { + if (heroBuilder_ == null) { + return hero_.get(index); } else { + return heroBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public java.util.List + getHeroOrBuilderList() { + if (heroBuilder_ != null) { + return heroBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(hero_); + } + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.Builder addHeroBuilder() { + return getHeroFieldBuilder().addBuilder( + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.getDefaultInstance()); + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.Builder addHeroBuilder( + int index) { + return getHeroFieldBuilder().addBuilder( + index, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.getDefaultInstance()); + } + /** + * repeated .com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo hero = 1; + */ + public java.util.List + getHeroBuilderList() { + return getHeroFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.Builder, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfoOrBuilder> + getHeroFieldBuilder() { + if (heroBuilder_ == null) { + heroBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfo.Builder, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleBossInfoOrBuilder>( + hero_, + ((bitField0_ & 0x00000001) == 0x00000001), + getParentForChildren(), + isClean()); + hero_ = null; + } + return heroBuilder_; + } + + // repeated int32 PokemonInfos = 2; + private java.util.List pokemonInfos_ = java.util.Collections.emptyList(); + private void ensurePokemonInfosIsMutable() { + if (!((bitField0_ & 0x00000002) == 0x00000002)) { + pokemonInfos_ = new java.util.ArrayList(pokemonInfos_); + bitField0_ |= 0x00000002; + } + } + /** + * repeated int32 PokemonInfos = 2; + */ + public java.util.List + getPokemonInfosList() { + return java.util.Collections.unmodifiableList(pokemonInfos_); + } + /** + * repeated int32 PokemonInfos = 2; + */ + public int getPokemonInfosCount() { + return pokemonInfos_.size(); + } + /** + * repeated int32 PokemonInfos = 2; + */ + public int getPokemonInfos(int index) { + return pokemonInfos_.get(index); + } + /** + * repeated int32 PokemonInfos = 2; + */ + public Builder setPokemonInfos( + int index, int value) { + ensurePokemonInfosIsMutable(); + pokemonInfos_.set(index, value); + onChanged(); + return this; + } + /** + * repeated int32 PokemonInfos = 2; + */ + public Builder addPokemonInfos(int value) { + ensurePokemonInfosIsMutable(); + pokemonInfos_.add(value); + onChanged(); + return this; + } + /** + * repeated int32 PokemonInfos = 2; + */ + public Builder addAllPokemonInfos( + java.lang.Iterable values) { + ensurePokemonInfosIsMutable(); + super.addAll(values, pokemonInfos_); + onChanged(); + return this; + } + /** + * repeated int32 PokemonInfos = 2; + */ + public Builder clearPokemonInfos() { + pokemonInfos_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + + // optional int32 totalForce = 3; + private int totalForce_ ; + /** + * optional int32 totalForce = 3; + */ + public boolean hasTotalForce() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 totalForce = 3; + */ + public int getTotalForce() { + return totalForce_; + } + /** + * optional int32 totalForce = 3; + */ + public Builder setTotalForce(int value) { + bitField0_ |= 0x00000004; + totalForce_ = value; + onChanged(); + return this; + } + /** + * optional int32 totalForce = 3; + */ + public Builder clearTotalForce() { + bitField0_ = (bitField0_ & ~0x00000004); + totalForce_ = 0; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ExpeditionTeamInfo) + } + + static { + defaultInstance = new ExpeditionTeamInfo(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ExpeditionTeamInfo) + } + + public interface ExpeditionSimpleHeroInfoOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional string heroId = 1; + /** + * optional string heroId = 1; + * + *
+     *英雄id
+     * 
+ */ + boolean hasHeroId(); + /** + * optional string heroId = 1; + * + *
+     *英雄id
+     * 
+ */ + java.lang.String getHeroId(); + /** + * optional string heroId = 1; + * + *
+     *英雄id
+     * 
+ */ + com.google.protobuf.ByteString + getHeroIdBytes(); + + // optional int32 remainHp = 2; + /** + * optional int32 remainHp = 2; + * + *
+     *剩余血量
+     * 
+ */ + boolean hasRemainHp(); + /** + * optional int32 remainHp = 2; + * + *
+     *剩余血量
+     * 
+ */ + int getRemainHp(); + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ExpeditionSimpleHeroInfo} + */ + public static final class ExpeditionSimpleHeroInfo extends + com.google.protobuf.GeneratedMessage + implements ExpeditionSimpleHeroInfoOrBuilder { + // Use ExpeditionSimpleHeroInfo.newBuilder() to construct. + private ExpeditionSimpleHeroInfo(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private ExpeditionSimpleHeroInfo(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final ExpeditionSimpleHeroInfo defaultInstance; + public static ExpeditionSimpleHeroInfo getDefaultInstance() { + return defaultInstance; + } + + public ExpeditionSimpleHeroInfo getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ExpeditionSimpleHeroInfo( + 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: { + bitField0_ |= 0x00000001; + heroId_ = input.readBytes(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + remainHp_ = input.readInt32(); + 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.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo.class, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public ExpeditionSimpleHeroInfo parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ExpeditionSimpleHeroInfo(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional string heroId = 1; + public static final int HEROID_FIELD_NUMBER = 1; + private java.lang.Object heroId_; + /** + * optional string heroId = 1; + * + *
+     *英雄id
+     * 
+ */ + public boolean hasHeroId() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional string heroId = 1; + * + *
+     *英雄id
+     * 
+ */ + public java.lang.String getHeroId() { + java.lang.Object ref = heroId_; + 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()) { + heroId_ = s; + } + return s; + } + } + /** + * optional string heroId = 1; + * + *
+     *英雄id
+     * 
+ */ + public com.google.protobuf.ByteString + getHeroIdBytes() { + java.lang.Object ref = heroId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + heroId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + // optional int32 remainHp = 2; + public static final int REMAINHP_FIELD_NUMBER = 2; + private int remainHp_; + /** + * optional int32 remainHp = 2; + * + *
+     *剩余血量
+     * 
+ */ + public boolean hasRemainHp() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 remainHp = 2; + * + *
+     *剩余血量
+     * 
+ */ + public int getRemainHp() { + return remainHp_; + } + + private void initFields() { + heroId_ = ""; + remainHp_ = 0; + } + 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.writeBytes(1, getHeroIdBytes()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(2, remainHp_); + } + 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 + .computeBytesSize(1, getHeroIdBytes()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, remainHp_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo 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.ExpeditionSimpleHeroInfo} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfoOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo.class, com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo.Builder.class); + } + + // Construct using com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo.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(); + heroId_ = ""; + bitField0_ = (bitField0_ & ~0x00000001); + remainHp_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_descriptor; + } + + public com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo.getDefaultInstance(); + } + + public com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo build() { + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo buildPartial() { + com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo result = new com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.heroId_ = heroId_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.remainHp_ = remainHp_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo) { + return mergeFrom((com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo other) { + if (other == com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo.getDefaultInstance()) return this; + if (other.hasHeroId()) { + bitField0_ |= 0x00000001; + heroId_ = other.heroId_; + onChanged(); + } + if (other.hasRemainHp()) { + setRemainHp(other.getRemainHp()); + } + 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.CommonProto.ExpeditionSimpleHeroInfo parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.ljsd.jieling.protocols.CommonProto.ExpeditionSimpleHeroInfo) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional string heroId = 1; + private java.lang.Object heroId_ = ""; + /** + * optional string heroId = 1; + * + *
+       *英雄id
+       * 
+ */ + public boolean hasHeroId() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional string heroId = 1; + * + *
+       *英雄id
+       * 
+ */ + public java.lang.String getHeroId() { + java.lang.Object ref = heroId_; + if (!(ref instanceof java.lang.String)) { + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + heroId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string heroId = 1; + * + *
+       *英雄id
+       * 
+ */ + public com.google.protobuf.ByteString + getHeroIdBytes() { + java.lang.Object ref = heroId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + heroId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string heroId = 1; + * + *
+       *英雄id
+       * 
+ */ + public Builder setHeroId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + heroId_ = value; + onChanged(); + return this; + } + /** + * optional string heroId = 1; + * + *
+       *英雄id
+       * 
+ */ + public Builder clearHeroId() { + bitField0_ = (bitField0_ & ~0x00000001); + heroId_ = getDefaultInstance().getHeroId(); + onChanged(); + return this; + } + /** + * optional string heroId = 1; + * + *
+       *英雄id
+       * 
+ */ + public Builder setHeroIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + heroId_ = value; + onChanged(); + return this; + } + + // optional int32 remainHp = 2; + private int remainHp_ ; + /** + * optional int32 remainHp = 2; + * + *
+       *剩余血量
+       * 
+ */ + public boolean hasRemainHp() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 remainHp = 2; + * + *
+       *剩余血量
+       * 
+ */ + public int getRemainHp() { + return remainHp_; + } + /** + * optional int32 remainHp = 2; + * + *
+       *剩余血量
+       * 
+ */ + public Builder setRemainHp(int value) { + bitField0_ |= 0x00000002; + remainHp_ = value; + onChanged(); + return this; + } + /** + * optional int32 remainHp = 2; + * + *
+       *剩余血量
+       * 
+ */ + public Builder clearRemainHp() { + bitField0_ = (bitField0_ & ~0x00000002); + remainHp_ = 0; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ExpeditionSimpleHeroInfo) + } + + static { + defaultInstance = new ExpeditionSimpleHeroInfo(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ExpeditionSimpleHeroInfo) + } + private static com.google.protobuf.Descriptors.Descriptor internal_static_com_ljsd_jieling_protocols_ErrorResponse_descriptor; private static @@ -84972,6 +88652,26 @@ public final class CommonProto { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_com_ljsd_jieling_protocols_RedOneDetail_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleBossInfo_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleBossInfo_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_com_ljsd_jieling_protocols_ExpeditionTeamInfo_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_com_ljsd_jieling_protocols_ExpeditionTeamInfo_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -85227,12 +88927,24 @@ public final class CommonProto { "om.ljsd.jieling.protocols.TeamOneInfo\022\023\n" + "\013fightResult\030\003 \001(\005\022\n\n\002id\030\004 \001(\t\022\022\n\nroundT" + "Imes\030\005 \001(\005\022\016\n\006teamId\030\006 \001(\005\022\020\n\010position\030\007" + - " \001(\005\022\017\n\007isGUess\030\010 \001(\005\"N\n\nRedPackage\022\020\n\010u" + + " \001(\005\022\017\n\007isGUess\030\010 \001(\005\"_\n\nRedPackage\022\020\n\010u" + "serName\030\001 \001(\t\022\r\n\005redId\030\002 \001(\005\022\r\n\005isGet\030\003 " + - "\001(\005\022\020\n\010getCount\030\004 \001(\005\"g\n\014RedOneDetail\022\013\n" + - "\003uid\030\001 \001(\005\022\014\n\004head\030\002 \001(\005\022\021\n\theadFrame\030\003 ", - "\001(\005\022\014\n\004name\030\004 \001(\t\022\014\n\004time\030\005 \001(\005\022\r\n\005count" + - "\030\006 \001(\005B\002H\001" + "\001(\005\022\020\n\010getCount\030\004 \001(\005\022\017\n\007redType\030\005 \001(\005\"w" + + "\n\014RedOneDetail\022\013\n\003uid\030\001 \001(\005\022\014\n\004head\030\002 \001(", + "\005\022\021\n\theadFrame\030\003 \001(\005\022\014\n\004name\030\004 \001(\t\022\014\n\004ti" + + "me\030\005 \001(\005\022\r\n\005count\030\006 \001(\005\022\016\n\006itemId\030\007 \001(\005\"" + + "\251\001\n\022ExpeditionNodeInfo\022\016\n\006sortId\030\001 \001(\005\022\013" + + "\n\003lay\030\002 \001(\005\022\014\n\004type\030\003 \001(\005\022D\n\014bossTeaminf" + + "o\030\004 \001(\0132..com.ljsd.jieling.protocols.Exp" + + "editionTeamInfo\022\r\n\005state\030\005 \001(\005\022\023\n\013holyEq" + + "uipID\030\006 \003(\005\"Z\n\030ExpeditionSimpleBossInfo\022" + + "\017\n\007heroTid\030\001 \001(\005\022\014\n\004star\030\002 \001(\005\022\r\n\005level\030" + + "\003 \001(\005\022\020\n\010remainHp\030\004 \001(\005\"\202\001\n\022ExpeditionTe" + + "amInfo\022B\n\004hero\030\001 \003(\01324.com.ljsd.jieling.", + "protocols.ExpeditionSimpleBossInfo\022\024\n\014Po" + + "kemonInfos\030\002 \003(\005\022\022\n\ntotalForce\030\003 \001(\005\"<\n\030" + + "ExpeditionSimpleHeroInfo\022\016\n\006heroId\030\001 \001(\t" + + "\022\020\n\010remainHp\030\002 \001(\005B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -85784,13 +89496,37 @@ public final class CommonProto { internal_static_com_ljsd_jieling_protocols_RedPackage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_RedPackage_descriptor, - new java.lang.String[] { "UserName", "RedId", "IsGet", "GetCount", }); + new java.lang.String[] { "UserName", "RedId", "IsGet", "GetCount", "RedType", }); internal_static_com_ljsd_jieling_protocols_RedOneDetail_descriptor = getDescriptor().getMessageTypes().get(90); internal_static_com_ljsd_jieling_protocols_RedOneDetail_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_RedOneDetail_descriptor, - new java.lang.String[] { "Uid", "Head", "HeadFrame", "Name", "Time", "Count", }); + new java.lang.String[] { "Uid", "Head", "HeadFrame", "Name", "Time", "Count", "ItemId", }); + internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_descriptor = + getDescriptor().getMessageTypes().get(91); + internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_com_ljsd_jieling_protocols_ExpeditionNodeInfo_descriptor, + new java.lang.String[] { "SortId", "Lay", "Type", "BossTeaminfo", "State", "HolyEquipID", }); + internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleBossInfo_descriptor = + getDescriptor().getMessageTypes().get(92); + internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleBossInfo_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleBossInfo_descriptor, + new java.lang.String[] { "HeroTid", "Star", "Level", "RemainHp", }); + internal_static_com_ljsd_jieling_protocols_ExpeditionTeamInfo_descriptor = + getDescriptor().getMessageTypes().get(93); + internal_static_com_ljsd_jieling_protocols_ExpeditionTeamInfo_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_com_ljsd_jieling_protocols_ExpeditionTeamInfo_descriptor, + new java.lang.String[] { "Hero", "PokemonInfos", "TotalForce", }); + internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_descriptor = + getDescriptor().getMessageTypes().get(94); + internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_descriptor, + new java.lang.String[] { "HeroId", "RemainHp", }); return null; } }; diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java index 0d72d693c..a35e766f0 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java @@ -36579,29 +36579,29 @@ public final class Family { public interface GetAllRedPackageResponseOrBuilder extends com.google.protobuf.MessageOrBuilder { - // repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + // repeated .com.ljsd.jieling.protocols.RedPackage info = 1; /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ java.util.List - getAllRedList(); + getInfoList(); /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - com.ljsd.jieling.protocols.CommonProto.RedPackage getAllRed(int index); + com.ljsd.jieling.protocols.CommonProto.RedPackage getInfo(int index); /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - int getAllRedCount(); + int getInfoCount(); /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ java.util.List - getAllRedOrBuilderList(); + getInfoOrBuilderList(); /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - com.ljsd.jieling.protocols.CommonProto.RedPackageOrBuilder getAllRedOrBuilder( + com.ljsd.jieling.protocols.CommonProto.RedPackageOrBuilder getInfoOrBuilder( int index); } /** @@ -36661,10 +36661,10 @@ public final class Family { } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - allRed_ = new java.util.ArrayList(); + info_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - allRed_.add(input.readMessage(com.ljsd.jieling.protocols.CommonProto.RedPackage.PARSER, extensionRegistry)); + info_.add(input.readMessage(com.ljsd.jieling.protocols.CommonProto.RedPackage.PARSER, extensionRegistry)); break; } } @@ -36676,7 +36676,7 @@ public final class Family { e.getMessage()).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - allRed_ = java.util.Collections.unmodifiableList(allRed_); + info_ = java.util.Collections.unmodifiableList(info_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -36709,44 +36709,44 @@ public final class Family { return PARSER; } - // repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; - public static final int ALLRED_FIELD_NUMBER = 1; - private java.util.List allRed_; + // repeated .com.ljsd.jieling.protocols.RedPackage info = 1; + public static final int INFO_FIELD_NUMBER = 1; + private java.util.List info_; /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public java.util.List getAllRedList() { - return allRed_; + public java.util.List getInfoList() { + return info_; } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ public java.util.List - getAllRedOrBuilderList() { - return allRed_; + getInfoOrBuilderList() { + return info_; } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public int getAllRedCount() { - return allRed_.size(); + public int getInfoCount() { + return info_.size(); } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public com.ljsd.jieling.protocols.CommonProto.RedPackage getAllRed(int index) { - return allRed_.get(index); + public com.ljsd.jieling.protocols.CommonProto.RedPackage getInfo(int index) { + return info_.get(index); } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public com.ljsd.jieling.protocols.CommonProto.RedPackageOrBuilder getAllRedOrBuilder( + public com.ljsd.jieling.protocols.CommonProto.RedPackageOrBuilder getInfoOrBuilder( int index) { - return allRed_.get(index); + return info_.get(index); } private void initFields() { - allRed_ = java.util.Collections.emptyList(); + info_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -36760,8 +36760,8 @@ public final class Family { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - for (int i = 0; i < allRed_.size(); i++) { - output.writeMessage(1, allRed_.get(i)); + for (int i = 0; i < info_.size(); i++) { + output.writeMessage(1, info_.get(i)); } getUnknownFields().writeTo(output); } @@ -36772,9 +36772,9 @@ public final class Family { if (size != -1) return size; size = 0; - for (int i = 0; i < allRed_.size(); i++) { + for (int i = 0; i < info_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, allRed_.get(i)); + .computeMessageSize(1, info_.get(i)); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -36888,7 +36888,7 @@ public final class Family { } private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getAllRedFieldBuilder(); + getInfoFieldBuilder(); } } private static Builder create() { @@ -36897,11 +36897,11 @@ public final class Family { public Builder clear() { super.clear(); - if (allRedBuilder_ == null) { - allRed_ = java.util.Collections.emptyList(); + if (infoBuilder_ == null) { + info_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); } else { - allRedBuilder_.clear(); + infoBuilder_.clear(); } return this; } @@ -36930,14 +36930,14 @@ public final class Family { public com.ljsd.jieling.protocols.Family.GetAllRedPackageResponse buildPartial() { com.ljsd.jieling.protocols.Family.GetAllRedPackageResponse result = new com.ljsd.jieling.protocols.Family.GetAllRedPackageResponse(this); int from_bitField0_ = bitField0_; - if (allRedBuilder_ == null) { + if (infoBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { - allRed_ = java.util.Collections.unmodifiableList(allRed_); + info_ = java.util.Collections.unmodifiableList(info_); bitField0_ = (bitField0_ & ~0x00000001); } - result.allRed_ = allRed_; + result.info_ = info_; } else { - result.allRed_ = allRedBuilder_.build(); + result.info_ = infoBuilder_.build(); } onBuilt(); return result; @@ -36954,29 +36954,29 @@ public final class Family { public Builder mergeFrom(com.ljsd.jieling.protocols.Family.GetAllRedPackageResponse other) { if (other == com.ljsd.jieling.protocols.Family.GetAllRedPackageResponse.getDefaultInstance()) return this; - if (allRedBuilder_ == null) { - if (!other.allRed_.isEmpty()) { - if (allRed_.isEmpty()) { - allRed_ = other.allRed_; + if (infoBuilder_ == null) { + if (!other.info_.isEmpty()) { + if (info_.isEmpty()) { + info_ = other.info_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureAllRedIsMutable(); - allRed_.addAll(other.allRed_); + ensureInfoIsMutable(); + info_.addAll(other.info_); } onChanged(); } } else { - if (!other.allRed_.isEmpty()) { - if (allRedBuilder_.isEmpty()) { - allRedBuilder_.dispose(); - allRedBuilder_ = null; - allRed_ = other.allRed_; + if (!other.info_.isEmpty()) { + if (infoBuilder_.isEmpty()) { + infoBuilder_.dispose(); + infoBuilder_ = null; + info_ = other.info_; bitField0_ = (bitField0_ & ~0x00000001); - allRedBuilder_ = + infoBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getAllRedFieldBuilder() : null; + getInfoFieldBuilder() : null; } else { - allRedBuilder_.addAllMessages(other.allRed_); + infoBuilder_.addAllMessages(other.info_); } } } @@ -37007,244 +37007,244 @@ public final class Family { } private int bitField0_; - // repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; - private java.util.List allRed_ = + // repeated .com.ljsd.jieling.protocols.RedPackage info = 1; + private java.util.List info_ = java.util.Collections.emptyList(); - private void ensureAllRedIsMutable() { + private void ensureInfoIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - allRed_ = new java.util.ArrayList(allRed_); + info_ = new java.util.ArrayList(info_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - com.ljsd.jieling.protocols.CommonProto.RedPackage, com.ljsd.jieling.protocols.CommonProto.RedPackage.Builder, com.ljsd.jieling.protocols.CommonProto.RedPackageOrBuilder> allRedBuilder_; + com.ljsd.jieling.protocols.CommonProto.RedPackage, com.ljsd.jieling.protocols.CommonProto.RedPackage.Builder, com.ljsd.jieling.protocols.CommonProto.RedPackageOrBuilder> infoBuilder_; /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public java.util.List getAllRedList() { - if (allRedBuilder_ == null) { - return java.util.Collections.unmodifiableList(allRed_); + public java.util.List getInfoList() { + if (infoBuilder_ == null) { + return java.util.Collections.unmodifiableList(info_); } else { - return allRedBuilder_.getMessageList(); + return infoBuilder_.getMessageList(); } } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public int getAllRedCount() { - if (allRedBuilder_ == null) { - return allRed_.size(); + public int getInfoCount() { + if (infoBuilder_ == null) { + return info_.size(); } else { - return allRedBuilder_.getCount(); + return infoBuilder_.getCount(); } } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public com.ljsd.jieling.protocols.CommonProto.RedPackage getAllRed(int index) { - if (allRedBuilder_ == null) { - return allRed_.get(index); + public com.ljsd.jieling.protocols.CommonProto.RedPackage getInfo(int index) { + if (infoBuilder_ == null) { + return info_.get(index); } else { - return allRedBuilder_.getMessage(index); + return infoBuilder_.getMessage(index); } } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public Builder setAllRed( + public Builder setInfo( int index, com.ljsd.jieling.protocols.CommonProto.RedPackage value) { - if (allRedBuilder_ == null) { + if (infoBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureAllRedIsMutable(); - allRed_.set(index, value); + ensureInfoIsMutable(); + info_.set(index, value); onChanged(); } else { - allRedBuilder_.setMessage(index, value); + infoBuilder_.setMessage(index, value); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public Builder setAllRed( + public Builder setInfo( int index, com.ljsd.jieling.protocols.CommonProto.RedPackage.Builder builderForValue) { - if (allRedBuilder_ == null) { - ensureAllRedIsMutable(); - allRed_.set(index, builderForValue.build()); + if (infoBuilder_ == null) { + ensureInfoIsMutable(); + info_.set(index, builderForValue.build()); onChanged(); } else { - allRedBuilder_.setMessage(index, builderForValue.build()); + infoBuilder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public Builder addAllRed(com.ljsd.jieling.protocols.CommonProto.RedPackage value) { - if (allRedBuilder_ == null) { + public Builder addInfo(com.ljsd.jieling.protocols.CommonProto.RedPackage value) { + if (infoBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureAllRedIsMutable(); - allRed_.add(value); + ensureInfoIsMutable(); + info_.add(value); onChanged(); } else { - allRedBuilder_.addMessage(value); + infoBuilder_.addMessage(value); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public Builder addAllRed( + public Builder addInfo( int index, com.ljsd.jieling.protocols.CommonProto.RedPackage value) { - if (allRedBuilder_ == null) { + if (infoBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureAllRedIsMutable(); - allRed_.add(index, value); + ensureInfoIsMutable(); + info_.add(index, value); onChanged(); } else { - allRedBuilder_.addMessage(index, value); + infoBuilder_.addMessage(index, value); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public Builder addAllRed( + public Builder addInfo( com.ljsd.jieling.protocols.CommonProto.RedPackage.Builder builderForValue) { - if (allRedBuilder_ == null) { - ensureAllRedIsMutable(); - allRed_.add(builderForValue.build()); + if (infoBuilder_ == null) { + ensureInfoIsMutable(); + info_.add(builderForValue.build()); onChanged(); } else { - allRedBuilder_.addMessage(builderForValue.build()); + infoBuilder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public Builder addAllRed( + public Builder addInfo( int index, com.ljsd.jieling.protocols.CommonProto.RedPackage.Builder builderForValue) { - if (allRedBuilder_ == null) { - ensureAllRedIsMutable(); - allRed_.add(index, builderForValue.build()); + if (infoBuilder_ == null) { + ensureInfoIsMutable(); + info_.add(index, builderForValue.build()); onChanged(); } else { - allRedBuilder_.addMessage(index, builderForValue.build()); + infoBuilder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public Builder addAllAllRed( + public Builder addAllInfo( java.lang.Iterable values) { - if (allRedBuilder_ == null) { - ensureAllRedIsMutable(); - super.addAll(values, allRed_); + if (infoBuilder_ == null) { + ensureInfoIsMutable(); + super.addAll(values, info_); onChanged(); } else { - allRedBuilder_.addAllMessages(values); + infoBuilder_.addAllMessages(values); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public Builder clearAllRed() { - if (allRedBuilder_ == null) { - allRed_ = java.util.Collections.emptyList(); + public Builder clearInfo() { + if (infoBuilder_ == null) { + info_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - allRedBuilder_.clear(); + infoBuilder_.clear(); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public Builder removeAllRed(int index) { - if (allRedBuilder_ == null) { - ensureAllRedIsMutable(); - allRed_.remove(index); + public Builder removeInfo(int index) { + if (infoBuilder_ == null) { + ensureInfoIsMutable(); + info_.remove(index); onChanged(); } else { - allRedBuilder_.remove(index); + infoBuilder_.remove(index); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public com.ljsd.jieling.protocols.CommonProto.RedPackage.Builder getAllRedBuilder( + public com.ljsd.jieling.protocols.CommonProto.RedPackage.Builder getInfoBuilder( int index) { - return getAllRedFieldBuilder().getBuilder(index); + return getInfoFieldBuilder().getBuilder(index); } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public com.ljsd.jieling.protocols.CommonProto.RedPackageOrBuilder getAllRedOrBuilder( + public com.ljsd.jieling.protocols.CommonProto.RedPackageOrBuilder getInfoOrBuilder( int index) { - if (allRedBuilder_ == null) { - return allRed_.get(index); } else { - return allRedBuilder_.getMessageOrBuilder(index); + if (infoBuilder_ == null) { + return info_.get(index); } else { + return infoBuilder_.getMessageOrBuilder(index); } } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ public java.util.List - getAllRedOrBuilderList() { - if (allRedBuilder_ != null) { - return allRedBuilder_.getMessageOrBuilderList(); + getInfoOrBuilderList() { + if (infoBuilder_ != null) { + return infoBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(allRed_); + return java.util.Collections.unmodifiableList(info_); } } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public com.ljsd.jieling.protocols.CommonProto.RedPackage.Builder addAllRedBuilder() { - return getAllRedFieldBuilder().addBuilder( + public com.ljsd.jieling.protocols.CommonProto.RedPackage.Builder addInfoBuilder() { + return getInfoFieldBuilder().addBuilder( com.ljsd.jieling.protocols.CommonProto.RedPackage.getDefaultInstance()); } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ - public com.ljsd.jieling.protocols.CommonProto.RedPackage.Builder addAllRedBuilder( + public com.ljsd.jieling.protocols.CommonProto.RedPackage.Builder addInfoBuilder( int index) { - return getAllRedFieldBuilder().addBuilder( + return getInfoFieldBuilder().addBuilder( index, com.ljsd.jieling.protocols.CommonProto.RedPackage.getDefaultInstance()); } /** - * repeated .com.ljsd.jieling.protocols.RedPackage allRed = 1; + * repeated .com.ljsd.jieling.protocols.RedPackage info = 1; */ public java.util.List - getAllRedBuilderList() { - return getAllRedFieldBuilder().getBuilderList(); + getInfoBuilderList() { + return getInfoFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< com.ljsd.jieling.protocols.CommonProto.RedPackage, com.ljsd.jieling.protocols.CommonProto.RedPackage.Builder, com.ljsd.jieling.protocols.CommonProto.RedPackageOrBuilder> - getAllRedFieldBuilder() { - if (allRedBuilder_ == null) { - allRedBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + getInfoFieldBuilder() { + if (infoBuilder_ == null) { + infoBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< com.ljsd.jieling.protocols.CommonProto.RedPackage, com.ljsd.jieling.protocols.CommonProto.RedPackage.Builder, com.ljsd.jieling.protocols.CommonProto.RedPackageOrBuilder>( - allRed_, + info_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), isClean()); - allRed_ = null; + info_ = null; } - return allRedBuilder_; + return infoBuilder_; } // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.GetAllRedPackageResponse) @@ -37270,16 +37270,6 @@ public final class Family { * optional int32 id = 1; */ int getId(); - - // optional int32 type = 2; - /** - * optional int32 type = 2; - */ - boolean hasType(); - /** - * optional int32 type = 2; - */ - int getType(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.RobRedPackageRequest} @@ -37341,11 +37331,6 @@ public final class Family { id_ = input.readInt32(); break; } - case 16: { - bitField0_ |= 0x00000002; - type_ = input.readInt32(); - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -37402,25 +37387,8 @@ public final class Family { return id_; } - // optional int32 type = 2; - public static final int TYPE_FIELD_NUMBER = 2; - private int type_; - /** - * optional int32 type = 2; - */ - public boolean hasType() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional int32 type = 2; - */ - public int getType() { - return type_; - } - private void initFields() { id_ = 0; - type_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -37437,9 +37405,6 @@ public final class Family { if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeInt32(1, id_); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeInt32(2, type_); - } getUnknownFields().writeTo(output); } @@ -37453,10 +37418,6 @@ public final class Family { size += com.google.protobuf.CodedOutputStream .computeInt32Size(1, id_); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(2, type_); - } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -37579,8 +37540,6 @@ public final class Family { super.clear(); id_ = 0; bitField0_ = (bitField0_ & ~0x00000001); - type_ = 0; - bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -37613,10 +37572,6 @@ public final class Family { to_bitField0_ |= 0x00000001; } result.id_ = id_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.type_ = type_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -37636,9 +37591,6 @@ public final class Family { if (other.hasId()) { setId(other.getId()); } - if (other.hasType()) { - setType(other.getType()); - } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -37699,39 +37651,6 @@ public final class Family { return this; } - // optional int32 type = 2; - private int type_ ; - /** - * optional int32 type = 2; - */ - public boolean hasType() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional int32 type = 2; - */ - public int getType() { - return type_; - } - /** - * optional int32 type = 2; - */ - public Builder setType(int value) { - bitField0_ |= 0x00000002; - type_ = value; - onChanged(); - return this; - } - /** - * optional int32 type = 2; - */ - public Builder clearType() { - bitField0_ = (bitField0_ & ~0x00000002); - type_ = 0; - onChanged(); - return this; - } - // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.RobRedPackageRequest) } @@ -38580,6 +38499,41 @@ public final class Family { * optional int32 remainTime = 2; */ int getRemainTime(); + + // optional string sendName = 3; + /** + * optional string sendName = 3; + */ + boolean hasSendName(); + /** + * optional string sendName = 3; + */ + java.lang.String getSendName(); + /** + * optional string sendName = 3; + */ + com.google.protobuf.ByteString + getSendNameBytes(); + + // optional int32 head = 4; + /** + * optional int32 head = 4; + */ + boolean hasHead(); + /** + * optional int32 head = 4; + */ + int getHead(); + + // optional int32 headFrame = 5; + /** + * optional int32 headFrame = 5; + */ + boolean hasHeadFrame(); + /** + * optional int32 headFrame = 5; + */ + int getHeadFrame(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.RedPackageDetailResponse} @@ -38645,6 +38599,21 @@ public final class Family { remainTime_ = input.readInt32(); break; } + case 26: { + bitField0_ |= 0x00000002; + sendName_ = input.readBytes(); + break; + } + case 32: { + bitField0_ |= 0x00000004; + head_ = input.readInt32(); + break; + } + case 40: { + bitField0_ |= 0x00000008; + headFrame_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -38740,9 +38709,87 @@ public final class Family { return remainTime_; } + // optional string sendName = 3; + public static final int SENDNAME_FIELD_NUMBER = 3; + private java.lang.Object sendName_; + /** + * optional string sendName = 3; + */ + public boolean hasSendName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional string sendName = 3; + */ + public java.lang.String getSendName() { + java.lang.Object ref = sendName_; + 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()) { + sendName_ = s; + } + return s; + } + } + /** + * optional string sendName = 3; + */ + public com.google.protobuf.ByteString + getSendNameBytes() { + java.lang.Object ref = sendName_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + sendName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + // optional int32 head = 4; + public static final int HEAD_FIELD_NUMBER = 4; + private int head_; + /** + * optional int32 head = 4; + */ + public boolean hasHead() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 head = 4; + */ + public int getHead() { + return head_; + } + + // optional int32 headFrame = 5; + public static final int HEADFRAME_FIELD_NUMBER = 5; + private int headFrame_; + /** + * optional int32 headFrame = 5; + */ + public boolean hasHeadFrame() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional int32 headFrame = 5; + */ + public int getHeadFrame() { + return headFrame_; + } + private void initFields() { info_ = java.util.Collections.emptyList(); remainTime_ = 0; + sendName_ = ""; + head_ = 0; + headFrame_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -38762,6 +38809,15 @@ public final class Family { if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeInt32(2, remainTime_); } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeBytes(3, getSendNameBytes()); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeInt32(4, head_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeInt32(5, headFrame_); + } getUnknownFields().writeTo(output); } @@ -38779,6 +38835,18 @@ public final class Family { size += com.google.protobuf.CodedOutputStream .computeInt32Size(2, remainTime_); } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(3, getSendNameBytes()); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(4, head_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(5, headFrame_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -38904,6 +38972,12 @@ public final class Family { } remainTime_ = 0; bitField0_ = (bitField0_ & ~0x00000002); + sendName_ = ""; + bitField0_ = (bitField0_ & ~0x00000004); + head_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); + headFrame_ = 0; + bitField0_ = (bitField0_ & ~0x00000010); return this; } @@ -38945,6 +39019,18 @@ public final class Family { to_bitField0_ |= 0x00000001; } result.remainTime_ = remainTime_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000002; + } + result.sendName_ = sendName_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000004; + } + result.head_ = head_; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { + to_bitField0_ |= 0x00000008; + } + result.headFrame_ = headFrame_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -38990,6 +39076,17 @@ public final class Family { if (other.hasRemainTime()) { setRemainTime(other.getRemainTime()); } + if (other.hasSendName()) { + bitField0_ |= 0x00000004; + sendName_ = other.sendName_; + onChanged(); + } + if (other.hasHead()) { + setHead(other.getHead()); + } + if (other.hasHeadFrame()) { + setHeadFrame(other.getHeadFrame()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -39290,6 +39387,146 @@ public final class Family { return this; } + // optional string sendName = 3; + private java.lang.Object sendName_ = ""; + /** + * optional string sendName = 3; + */ + public boolean hasSendName() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional string sendName = 3; + */ + public java.lang.String getSendName() { + java.lang.Object ref = sendName_; + if (!(ref instanceof java.lang.String)) { + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + sendName_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string sendName = 3; + */ + public com.google.protobuf.ByteString + getSendNameBytes() { + java.lang.Object ref = sendName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + sendName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string sendName = 3; + */ + public Builder setSendName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000004; + sendName_ = value; + onChanged(); + return this; + } + /** + * optional string sendName = 3; + */ + public Builder clearSendName() { + bitField0_ = (bitField0_ & ~0x00000004); + sendName_ = getDefaultInstance().getSendName(); + onChanged(); + return this; + } + /** + * optional string sendName = 3; + */ + public Builder setSendNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000004; + sendName_ = value; + onChanged(); + return this; + } + + // optional int32 head = 4; + private int head_ ; + /** + * optional int32 head = 4; + */ + public boolean hasHead() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional int32 head = 4; + */ + public int getHead() { + return head_; + } + /** + * optional int32 head = 4; + */ + public Builder setHead(int value) { + bitField0_ |= 0x00000008; + head_ = value; + onChanged(); + return this; + } + /** + * optional int32 head = 4; + */ + public Builder clearHead() { + bitField0_ = (bitField0_ & ~0x00000008); + head_ = 0; + onChanged(); + return this; + } + + // optional int32 headFrame = 5; + private int headFrame_ ; + /** + * optional int32 headFrame = 5; + */ + public boolean hasHeadFrame() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional int32 headFrame = 5; + */ + public int getHeadFrame() { + return headFrame_; + } + /** + * optional int32 headFrame = 5; + */ + public Builder setHeadFrame(int value) { + bitField0_ |= 0x00000010; + headFrame_ = value; + onChanged(); + return this; + } + /** + * optional int32 headFrame = 5; + */ + public Builder clearHeadFrame() { + bitField0_ = (bitField0_ & ~0x00000010); + headFrame_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.RedPackageDetailResponse) } @@ -39715,15 +39952,16 @@ public final class Family { "\0228\n\005blood\030\001 \003(\0132).com.ljsd.jieling.proto" + "cols.HeroBloodInfo\" \n\020RefuseJoinFamily\022\014" + "\n\004name\030\001 \001(\t\" \n\021KickOutIndication\022\013\n\003uid", - "\030\001 \001(\005\"R\n\030GetAllRedPackageResponse\0226\n\006al" + - "lRed\030\001 \003(\0132&.com.ljsd.jieling.protocols." + - "RedPackage\"0\n\024RobRedPackageRequest\022\n\n\002id" + - "\030\001 \001(\005\022\014\n\004type\030\002 \001(\005\"*\n\025RobRedPackageRes" + - "ponse\022\021\n\tisSuccess\030\001 \001(\005\"%\n\027RedPackageDe" + - "tailRequest\022\n\n\002id\030\001 \001(\005\"f\n\030RedPackageDet" + - "ailResponse\0226\n\004info\030\001 \003(\0132(.com.ljsd.jie" + - "ling.protocols.RedOneDetail\022\022\n\nremainTim" + - "e\030\002 \001(\005B\002H\001" + "\030\001 \001(\005\"P\n\030GetAllRedPackageResponse\0224\n\004in" + + "fo\030\001 \003(\0132&.com.ljsd.jieling.protocols.Re" + + "dPackage\"\"\n\024RobRedPackageRequest\022\n\n\002id\030\001" + + " \001(\005\"*\n\025RobRedPackageResponse\022\021\n\tisSucce" + + "ss\030\001 \001(\005\"%\n\027RedPackageDetailRequest\022\n\n\002i" + + "d\030\001 \001(\005\"\231\001\n\030RedPackageDetailResponse\0226\n\004" + + "info\030\001 \003(\0132(.com.ljsd.jieling.protocols." + + "RedOneDetail\022\022\n\nremainTime\030\002 \001(\005\022\020\n\010send" + + "Name\030\003 \001(\t\022\014\n\004head\030\004 \001(\005\022\021\n\theadFrame\030\005 " + + "\001(\005B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -40047,13 +40285,13 @@ public final class Family { internal_static_com_ljsd_jieling_protocols_GetAllRedPackageResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_GetAllRedPackageResponse_descriptor, - new java.lang.String[] { "AllRed", }); + new java.lang.String[] { "Info", }); internal_static_com_ljsd_jieling_protocols_RobRedPackageRequest_descriptor = getDescriptor().getMessageTypes().get(53); internal_static_com_ljsd_jieling_protocols_RobRedPackageRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_RobRedPackageRequest_descriptor, - new java.lang.String[] { "Id", "Type", }); + new java.lang.String[] { "Id", }); internal_static_com_ljsd_jieling_protocols_RobRedPackageResponse_descriptor = getDescriptor().getMessageTypes().get(54); internal_static_com_ljsd_jieling_protocols_RobRedPackageResponse_fieldAccessorTable = new @@ -40071,7 +40309,7 @@ public final class Family { internal_static_com_ljsd_jieling_protocols_RedPackageDetailResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_RedPackageDetailResponse_descriptor, - new java.lang.String[] { "Info", "RemainTime", }); + new java.lang.String[] { "Info", "RemainTime", "SendName", "Head", "HeadFrame", }); return null; } }; diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/FightInfoProto.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/FightInfoProto.java index 6c28a1528..a4838bf44 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/FightInfoProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/FightInfoProto.java @@ -7728,64 +7728,107 @@ public final class FightInfoProto { public interface SweepRightResponseOrBuilder extends com.google.protobuf.MessageOrBuilder { - // repeated .com.ljsd.jieling.protocols.Drop Drop = 1; + // optional .com.ljsd.jieling.protocols.Drop Drop = 1; /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; + * optional .com.ljsd.jieling.protocols.Drop Drop = 1; * *
      * 获得的道具
      * 
*/ - java.util.List - getDropList(); + boolean hasDrop(); /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; + * optional .com.ljsd.jieling.protocols.Drop Drop = 1; * *
      * 获得的道具
      * 
*/ - com.ljsd.jieling.protocols.CommonProto.Drop getDrop(int index); + com.ljsd.jieling.protocols.CommonProto.Drop getDrop(); /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; + * optional .com.ljsd.jieling.protocols.Drop Drop = 1; * *
      * 获得的道具
      * 
*/ - int getDropCount(); - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-     * 获得的道具
-     * 
- */ - java.util.List - getDropOrBuilderList(); - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-     * 获得的道具
-     * 
- */ - com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getDropOrBuilder( - int index); + com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getDropOrBuilder(); - // optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + // optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+     * 随机奖励
+     * 
+ */ + boolean hasRandomDrop(); + /** + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+     * 随机奖励
+     * 
+ */ + com.ljsd.jieling.protocols.CommonProto.Drop getRandomDrop(); + /** + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+     * 随机奖励
+     * 
+ */ + com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getRandomDropOrBuilder(); + + // optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; + /** + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; */ boolean hasItemInfo(); /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; */ com.ljsd.jieling.protocols.CommonProto.ItemInfo getItemInfo(); /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; */ com.ljsd.jieling.protocols.CommonProto.ItemInfoOrBuilder getItemInfoOrBuilder(); + + // optional int32 hurt = 4; + /** + * optional int32 hurt = 4; + */ + boolean hasHurt(); + /** + * optional int32 hurt = 4; + */ + int getHurt(); + + // optional .com.ljsd.jieling.protocols.FightData fightData = 5; + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+     *战斗数据
+     * 
+ */ + boolean hasFightData(); + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+     *战斗数据
+     * 
+ */ + com.ljsd.jieling.protocols.CommonProto.FightData getFightData(); + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+     *战斗数据
+     * 
+ */ + com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder getFightDataOrBuilder(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.SweepRightResponse} @@ -7839,16 +7882,34 @@ public final class FightInfoProto { break; } case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - drop_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; + com.ljsd.jieling.protocols.CommonProto.Drop.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = drop_.toBuilder(); } - drop_.add(input.readMessage(com.ljsd.jieling.protocols.CommonProto.Drop.PARSER, extensionRegistry)); + drop_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.Drop.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(drop_); + drop_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; break; } case 18: { + com.ljsd.jieling.protocols.CommonProto.Drop.Builder subBuilder = null; + if (((bitField0_ & 0x00000002) == 0x00000002)) { + subBuilder = randomDrop_.toBuilder(); + } + randomDrop_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.Drop.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(randomDrop_); + randomDrop_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000002; + break; + } + case 26: { com.ljsd.jieling.protocols.CommonProto.ItemInfo.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = itemInfo_.toBuilder(); } itemInfo_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.ItemInfo.PARSER, extensionRegistry); @@ -7856,7 +7917,25 @@ public final class FightInfoProto { subBuilder.mergeFrom(itemInfo_); itemInfo_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000004; + break; + } + case 32: { + bitField0_ |= 0x00000008; + hurt_ = input.readInt32(); + break; + } + case 42: { + com.ljsd.jieling.protocols.CommonProto.FightData.Builder subBuilder = null; + if (((bitField0_ & 0x00000010) == 0x00000010)) { + subBuilder = fightData_.toBuilder(); + } + fightData_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.FightData.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(fightData_); + fightData_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000010; break; } } @@ -7867,9 +7946,6 @@ public final class FightInfoProto { throw new com.google.protobuf.InvalidProtocolBufferException( e.getMessage()).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - drop_ = java.util.Collections.unmodifiableList(drop_); - } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -7902,87 +7978,152 @@ public final class FightInfoProto { } private int bitField0_; - // repeated .com.ljsd.jieling.protocols.Drop Drop = 1; + // optional .com.ljsd.jieling.protocols.Drop Drop = 1; public static final int DROP_FIELD_NUMBER = 1; - private java.util.List drop_; + private com.ljsd.jieling.protocols.CommonProto.Drop drop_; /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; + * optional .com.ljsd.jieling.protocols.Drop Drop = 1; * *
      * 获得的道具
      * 
*/ - public java.util.List getDropList() { - return drop_; - } - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-     * 获得的道具
-     * 
- */ - public java.util.List - getDropOrBuilderList() { - return drop_; - } - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-     * 获得的道具
-     * 
- */ - public int getDropCount() { - return drop_.size(); - } - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-     * 获得的道具
-     * 
- */ - public com.ljsd.jieling.protocols.CommonProto.Drop getDrop(int index) { - return drop_.get(index); - } - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-     * 获得的道具
-     * 
- */ - public com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getDropOrBuilder( - int index) { - return drop_.get(index); - } - - // optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; - public static final int ITEMINFO_FIELD_NUMBER = 2; - private com.ljsd.jieling.protocols.CommonProto.ItemInfo itemInfo_; - /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; - */ - public boolean hasItemInfo() { + public boolean hasDrop() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + * optional .com.ljsd.jieling.protocols.Drop Drop = 1; + * + *
+     * 获得的道具
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Drop getDrop() { + return drop_; + } + /** + * optional .com.ljsd.jieling.protocols.Drop Drop = 1; + * + *
+     * 获得的道具
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getDropOrBuilder() { + return drop_; + } + + // optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + public static final int RANDOMDROP_FIELD_NUMBER = 2; + private com.ljsd.jieling.protocols.CommonProto.Drop randomDrop_; + /** + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+     * 随机奖励
+     * 
+ */ + public boolean hasRandomDrop() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+     * 随机奖励
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Drop getRandomDrop() { + return randomDrop_; + } + /** + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+     * 随机奖励
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getRandomDropOrBuilder() { + return randomDrop_; + } + + // optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; + public static final int ITEMINFO_FIELD_NUMBER = 3; + private com.ljsd.jieling.protocols.CommonProto.ItemInfo itemInfo_; + /** + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; + */ + public boolean hasItemInfo() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; */ public com.ljsd.jieling.protocols.CommonProto.ItemInfo getItemInfo() { return itemInfo_; } /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; */ public com.ljsd.jieling.protocols.CommonProto.ItemInfoOrBuilder getItemInfoOrBuilder() { return itemInfo_; } + // optional int32 hurt = 4; + public static final int HURT_FIELD_NUMBER = 4; + private int hurt_; + /** + * optional int32 hurt = 4; + */ + public boolean hasHurt() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional int32 hurt = 4; + */ + public int getHurt() { + return hurt_; + } + + // optional .com.ljsd.jieling.protocols.FightData fightData = 5; + public static final int FIGHTDATA_FIELD_NUMBER = 5; + private com.ljsd.jieling.protocols.CommonProto.FightData fightData_; + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+     *战斗数据
+     * 
+ */ + public boolean hasFightData() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+     *战斗数据
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.FightData getFightData() { + return fightData_; + } + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+     *战斗数据
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder getFightDataOrBuilder() { + return fightData_; + } + private void initFields() { - drop_ = java.util.Collections.emptyList(); + drop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); + randomDrop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); itemInfo_ = com.ljsd.jieling.protocols.CommonProto.ItemInfo.getDefaultInstance(); + hurt_ = 0; + fightData_ = com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -7996,11 +8137,20 @@ public final class FightInfoProto { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - for (int i = 0; i < drop_.size(); i++) { - output.writeMessage(1, drop_.get(i)); - } if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(2, itemInfo_); + output.writeMessage(1, drop_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeMessage(2, randomDrop_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeMessage(3, itemInfo_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeInt32(4, hurt_); + } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + output.writeMessage(5, fightData_); } getUnknownFields().writeTo(output); } @@ -8011,13 +8161,25 @@ public final class FightInfoProto { if (size != -1) return size; size = 0; - for (int i = 0; i < drop_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, drop_.get(i)); - } if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, itemInfo_); + .computeMessageSize(1, drop_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, randomDrop_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, itemInfo_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(4, hurt_); + } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, fightData_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -8128,7 +8290,9 @@ public final class FightInfoProto { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { getDropFieldBuilder(); + getRandomDropFieldBuilder(); getItemInfoFieldBuilder(); + getFightDataFieldBuilder(); } } private static Builder create() { @@ -8138,17 +8302,31 @@ public final class FightInfoProto { public Builder clear() { super.clear(); if (dropBuilder_ == null) { - drop_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + drop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); } else { dropBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); + if (randomDropBuilder_ == null) { + randomDrop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); + } else { + randomDropBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); if (itemInfoBuilder_ == null) { itemInfo_ = com.ljsd.jieling.protocols.CommonProto.ItemInfo.getDefaultInstance(); } else { itemInfoBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); + hurt_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); + if (fightDataBuilder_ == null) { + fightData_ = com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance(); + } else { + fightDataBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000010); return this; } @@ -8177,23 +8355,42 @@ public final class FightInfoProto { com.ljsd.jieling.protocols.FightInfoProto.SweepRightResponse result = new com.ljsd.jieling.protocols.FightInfoProto.SweepRightResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } if (dropBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { - drop_ = java.util.Collections.unmodifiableList(drop_); - bitField0_ = (bitField0_ & ~0x00000001); - } result.drop_ = drop_; } else { result.drop_ = dropBuilder_.build(); } if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000001; + to_bitField0_ |= 0x00000002; + } + if (randomDropBuilder_ == null) { + result.randomDrop_ = randomDrop_; + } else { + result.randomDrop_ = randomDropBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; } if (itemInfoBuilder_ == null) { result.itemInfo_ = itemInfo_; } else { result.itemInfo_ = itemInfoBuilder_.build(); } + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + result.hurt_ = hurt_; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { + to_bitField0_ |= 0x00000010; + } + if (fightDataBuilder_ == null) { + result.fightData_ = fightData_; + } else { + result.fightData_ = fightDataBuilder_.build(); + } result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -8210,35 +8407,21 @@ public final class FightInfoProto { public Builder mergeFrom(com.ljsd.jieling.protocols.FightInfoProto.SweepRightResponse other) { if (other == com.ljsd.jieling.protocols.FightInfoProto.SweepRightResponse.getDefaultInstance()) return this; - if (dropBuilder_ == null) { - if (!other.drop_.isEmpty()) { - if (drop_.isEmpty()) { - drop_ = other.drop_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureDropIsMutable(); - drop_.addAll(other.drop_); - } - onChanged(); - } - } else { - if (!other.drop_.isEmpty()) { - if (dropBuilder_.isEmpty()) { - dropBuilder_.dispose(); - dropBuilder_ = null; - drop_ = other.drop_; - bitField0_ = (bitField0_ & ~0x00000001); - dropBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getDropFieldBuilder() : null; - } else { - dropBuilder_.addAllMessages(other.drop_); - } - } + if (other.hasDrop()) { + mergeDrop(other.getDrop()); + } + if (other.hasRandomDrop()) { + mergeRandomDrop(other.getRandomDrop()); } if (other.hasItemInfo()) { mergeItemInfo(other.getItemInfo()); } + if (other.hasHurt()) { + setHurt(other.getHurt()); + } + if (other.hasFightData()) { + mergeFightData(other.getFightData()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -8266,197 +8449,97 @@ public final class FightInfoProto { } private int bitField0_; - // repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - private java.util.List drop_ = - java.util.Collections.emptyList(); - private void ensureDropIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { - drop_ = new java.util.ArrayList(drop_); - bitField0_ |= 0x00000001; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< + // optional .com.ljsd.jieling.protocols.Drop Drop = 1; + private com.ljsd.jieling.protocols.CommonProto.Drop drop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< com.ljsd.jieling.protocols.CommonProto.Drop, com.ljsd.jieling.protocols.CommonProto.Drop.Builder, com.ljsd.jieling.protocols.CommonProto.DropOrBuilder> dropBuilder_; - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; + * optional .com.ljsd.jieling.protocols.Drop Drop = 1; * *
        * 获得的道具
        * 
*/ - public java.util.List getDropList() { - if (dropBuilder_ == null) { - return java.util.Collections.unmodifiableList(drop_); - } else { - return dropBuilder_.getMessageList(); - } + public boolean hasDrop() { + return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; + * optional .com.ljsd.jieling.protocols.Drop Drop = 1; * *
        * 获得的道具
        * 
*/ - public int getDropCount() { + public com.ljsd.jieling.protocols.CommonProto.Drop getDrop() { if (dropBuilder_ == null) { - return drop_.size(); + return drop_; } else { - return dropBuilder_.getCount(); + return dropBuilder_.getMessage(); } } /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; + * optional .com.ljsd.jieling.protocols.Drop Drop = 1; * *
        * 获得的道具
        * 
*/ - public com.ljsd.jieling.protocols.CommonProto.Drop getDrop(int index) { + public Builder setDrop(com.ljsd.jieling.protocols.CommonProto.Drop value) { if (dropBuilder_ == null) { - return drop_.get(index); + if (value == null) { + throw new NullPointerException(); + } + drop_ = value; + onChanged(); } else { - return dropBuilder_.getMessage(index); + dropBuilder_.setMessage(value); } + bitField0_ |= 0x00000001; + return this; } /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; + * optional .com.ljsd.jieling.protocols.Drop Drop = 1; * *
        * 获得的道具
        * 
*/ public Builder setDrop( - int index, com.ljsd.jieling.protocols.CommonProto.Drop value) { - if (dropBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureDropIsMutable(); - drop_.set(index, value); - onChanged(); - } else { - dropBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-       * 获得的道具
-       * 
- */ - public Builder setDrop( - int index, com.ljsd.jieling.protocols.CommonProto.Drop.Builder builderForValue) { - if (dropBuilder_ == null) { - ensureDropIsMutable(); - drop_.set(index, builderForValue.build()); - onChanged(); - } else { - dropBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-       * 获得的道具
-       * 
- */ - public Builder addDrop(com.ljsd.jieling.protocols.CommonProto.Drop value) { - if (dropBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureDropIsMutable(); - drop_.add(value); - onChanged(); - } else { - dropBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-       * 获得的道具
-       * 
- */ - public Builder addDrop( - int index, com.ljsd.jieling.protocols.CommonProto.Drop value) { - if (dropBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureDropIsMutable(); - drop_.add(index, value); - onChanged(); - } else { - dropBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-       * 获得的道具
-       * 
- */ - public Builder addDrop( com.ljsd.jieling.protocols.CommonProto.Drop.Builder builderForValue) { if (dropBuilder_ == null) { - ensureDropIsMutable(); - drop_.add(builderForValue.build()); + drop_ = builderForValue.build(); onChanged(); } else { - dropBuilder_.addMessage(builderForValue.build()); + dropBuilder_.setMessage(builderForValue.build()); } + bitField0_ |= 0x00000001; return this; } /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; + * optional .com.ljsd.jieling.protocols.Drop Drop = 1; * *
        * 获得的道具
        * 
*/ - public Builder addDrop( - int index, com.ljsd.jieling.protocols.CommonProto.Drop.Builder builderForValue) { + public Builder mergeDrop(com.ljsd.jieling.protocols.CommonProto.Drop value) { if (dropBuilder_ == null) { - ensureDropIsMutable(); - drop_.add(index, builderForValue.build()); + if (((bitField0_ & 0x00000001) == 0x00000001) && + drop_ != com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance()) { + drop_ = + com.ljsd.jieling.protocols.CommonProto.Drop.newBuilder(drop_).mergeFrom(value).buildPartial(); + } else { + drop_ = value; + } onChanged(); } else { - dropBuilder_.addMessage(index, builderForValue.build()); + dropBuilder_.mergeFrom(value); } + bitField0_ |= 0x00000001; return this; } /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-       * 获得的道具
-       * 
- */ - public Builder addAllDrop( - java.lang.Iterable values) { - if (dropBuilder_ == null) { - ensureDropIsMutable(); - super.addAll(values, drop_); - onChanged(); - } else { - dropBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; + * optional .com.ljsd.jieling.protocols.Drop Drop = 1; * *
        * 获得的道具
@@ -8464,113 +8547,54 @@ public final class FightInfoProto {
        */
       public Builder clearDrop() {
         if (dropBuilder_ == null) {
-          drop_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          drop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance();
           onChanged();
         } else {
           dropBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
       /**
-       * repeated .com.ljsd.jieling.protocols.Drop Drop = 1;
+       * optional .com.ljsd.jieling.protocols.Drop Drop = 1;
        *
        * 
        * 获得的道具
        * 
*/ - public Builder removeDrop(int index) { - if (dropBuilder_ == null) { - ensureDropIsMutable(); - drop_.remove(index); - onChanged(); - } else { - dropBuilder_.remove(index); - } - return this; + public com.ljsd.jieling.protocols.CommonProto.Drop.Builder getDropBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getDropFieldBuilder().getBuilder(); } /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; + * optional .com.ljsd.jieling.protocols.Drop Drop = 1; * *
        * 获得的道具
        * 
*/ - public com.ljsd.jieling.protocols.CommonProto.Drop.Builder getDropBuilder( - int index) { - return getDropFieldBuilder().getBuilder(index); - } - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-       * 获得的道具
-       * 
- */ - public com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getDropOrBuilder( - int index) { - if (dropBuilder_ == null) { - return drop_.get(index); } else { - return dropBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-       * 获得的道具
-       * 
- */ - public java.util.List - getDropOrBuilderList() { + public com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getDropOrBuilder() { if (dropBuilder_ != null) { - return dropBuilder_.getMessageOrBuilderList(); + return dropBuilder_.getMessageOrBuilder(); } else { - return java.util.Collections.unmodifiableList(drop_); + return drop_; } } /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; + * optional .com.ljsd.jieling.protocols.Drop Drop = 1; * *
        * 获得的道具
        * 
*/ - public com.ljsd.jieling.protocols.CommonProto.Drop.Builder addDropBuilder() { - return getDropFieldBuilder().addBuilder( - com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance()); - } - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-       * 获得的道具
-       * 
- */ - public com.ljsd.jieling.protocols.CommonProto.Drop.Builder addDropBuilder( - int index) { - return getDropFieldBuilder().addBuilder( - index, com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance()); - } - /** - * repeated .com.ljsd.jieling.protocols.Drop Drop = 1; - * - *
-       * 获得的道具
-       * 
- */ - public java.util.List - getDropBuilderList() { - return getDropFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< + private com.google.protobuf.SingleFieldBuilder< com.ljsd.jieling.protocols.CommonProto.Drop, com.ljsd.jieling.protocols.CommonProto.Drop.Builder, com.ljsd.jieling.protocols.CommonProto.DropOrBuilder> getDropFieldBuilder() { if (dropBuilder_ == null) { - dropBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + dropBuilder_ = new com.google.protobuf.SingleFieldBuilder< com.ljsd.jieling.protocols.CommonProto.Drop, com.ljsd.jieling.protocols.CommonProto.Drop.Builder, com.ljsd.jieling.protocols.CommonProto.DropOrBuilder>( drop_, - ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), isClean()); drop_ = null; @@ -8578,18 +8602,171 @@ public final class FightInfoProto { return dropBuilder_; } - // optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + // optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + private com.ljsd.jieling.protocols.CommonProto.Drop randomDrop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Drop, com.ljsd.jieling.protocols.CommonProto.Drop.Builder, com.ljsd.jieling.protocols.CommonProto.DropOrBuilder> randomDropBuilder_; + /** + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+       * 随机奖励
+       * 
+ */ + public boolean hasRandomDrop() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+       * 随机奖励
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Drop getRandomDrop() { + if (randomDropBuilder_ == null) { + return randomDrop_; + } else { + return randomDropBuilder_.getMessage(); + } + } + /** + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+       * 随机奖励
+       * 
+ */ + public Builder setRandomDrop(com.ljsd.jieling.protocols.CommonProto.Drop value) { + if (randomDropBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + randomDrop_ = value; + onChanged(); + } else { + randomDropBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+       * 随机奖励
+       * 
+ */ + public Builder setRandomDrop( + com.ljsd.jieling.protocols.CommonProto.Drop.Builder builderForValue) { + if (randomDropBuilder_ == null) { + randomDrop_ = builderForValue.build(); + onChanged(); + } else { + randomDropBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+       * 随机奖励
+       * 
+ */ + public Builder mergeRandomDrop(com.ljsd.jieling.protocols.CommonProto.Drop value) { + if (randomDropBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002) && + randomDrop_ != com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance()) { + randomDrop_ = + com.ljsd.jieling.protocols.CommonProto.Drop.newBuilder(randomDrop_).mergeFrom(value).buildPartial(); + } else { + randomDrop_ = value; + } + onChanged(); + } else { + randomDropBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+       * 随机奖励
+       * 
+ */ + public Builder clearRandomDrop() { + if (randomDropBuilder_ == null) { + randomDrop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); + onChanged(); + } else { + randomDropBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+       * 随机奖励
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Drop.Builder getRandomDropBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getRandomDropFieldBuilder().getBuilder(); + } + /** + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+       * 随机奖励
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getRandomDropOrBuilder() { + if (randomDropBuilder_ != null) { + return randomDropBuilder_.getMessageOrBuilder(); + } else { + return randomDrop_; + } + } + /** + * optional .com.ljsd.jieling.protocols.Drop randomDrop = 2; + * + *
+       * 随机奖励
+       * 
+ */ + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Drop, com.ljsd.jieling.protocols.CommonProto.Drop.Builder, com.ljsd.jieling.protocols.CommonProto.DropOrBuilder> + getRandomDropFieldBuilder() { + if (randomDropBuilder_ == null) { + randomDropBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Drop, com.ljsd.jieling.protocols.CommonProto.Drop.Builder, com.ljsd.jieling.protocols.CommonProto.DropOrBuilder>( + randomDrop_, + getParentForChildren(), + isClean()); + randomDrop_ = null; + } + return randomDropBuilder_; + } + + // optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; private com.ljsd.jieling.protocols.CommonProto.ItemInfo itemInfo_ = com.ljsd.jieling.protocols.CommonProto.ItemInfo.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.ljsd.jieling.protocols.CommonProto.ItemInfo, com.ljsd.jieling.protocols.CommonProto.ItemInfo.Builder, com.ljsd.jieling.protocols.CommonProto.ItemInfoOrBuilder> itemInfoBuilder_; /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; */ public boolean hasItemInfo() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; */ public com.ljsd.jieling.protocols.CommonProto.ItemInfo getItemInfo() { if (itemInfoBuilder_ == null) { @@ -8599,7 +8776,7 @@ public final class FightInfoProto { } } /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; */ public Builder setItemInfo(com.ljsd.jieling.protocols.CommonProto.ItemInfo value) { if (itemInfoBuilder_ == null) { @@ -8611,11 +8788,11 @@ public final class FightInfoProto { } else { itemInfoBuilder_.setMessage(value); } - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return this; } /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; */ public Builder setItemInfo( com.ljsd.jieling.protocols.CommonProto.ItemInfo.Builder builderForValue) { @@ -8625,15 +8802,15 @@ public final class FightInfoProto { } else { itemInfoBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return this; } /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; */ public Builder mergeItemInfo(com.ljsd.jieling.protocols.CommonProto.ItemInfo value) { if (itemInfoBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002) && + if (((bitField0_ & 0x00000004) == 0x00000004) && itemInfo_ != com.ljsd.jieling.protocols.CommonProto.ItemInfo.getDefaultInstance()) { itemInfo_ = com.ljsd.jieling.protocols.CommonProto.ItemInfo.newBuilder(itemInfo_).mergeFrom(value).buildPartial(); @@ -8644,11 +8821,11 @@ public final class FightInfoProto { } else { itemInfoBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return this; } /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; */ public Builder clearItemInfo() { if (itemInfoBuilder_ == null) { @@ -8657,19 +8834,19 @@ public final class FightInfoProto { } else { itemInfoBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); return this; } /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; */ public com.ljsd.jieling.protocols.CommonProto.ItemInfo.Builder getItemInfoBuilder() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; onChanged(); return getItemInfoFieldBuilder().getBuilder(); } /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; */ public com.ljsd.jieling.protocols.CommonProto.ItemInfoOrBuilder getItemInfoOrBuilder() { if (itemInfoBuilder_ != null) { @@ -8679,7 +8856,7 @@ public final class FightInfoProto { } } /** - * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 2; + * optional .com.ljsd.jieling.protocols.ItemInfo ItemInfo = 3; */ private com.google.protobuf.SingleFieldBuilder< com.ljsd.jieling.protocols.CommonProto.ItemInfo, com.ljsd.jieling.protocols.CommonProto.ItemInfo.Builder, com.ljsd.jieling.protocols.CommonProto.ItemInfoOrBuilder> @@ -8695,6 +8872,192 @@ public final class FightInfoProto { return itemInfoBuilder_; } + // optional int32 hurt = 4; + private int hurt_ ; + /** + * optional int32 hurt = 4; + */ + public boolean hasHurt() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional int32 hurt = 4; + */ + public int getHurt() { + return hurt_; + } + /** + * optional int32 hurt = 4; + */ + public Builder setHurt(int value) { + bitField0_ |= 0x00000008; + hurt_ = value; + onChanged(); + return this; + } + /** + * optional int32 hurt = 4; + */ + public Builder clearHurt() { + bitField0_ = (bitField0_ & ~0x00000008); + hurt_ = 0; + onChanged(); + return this; + } + + // optional .com.ljsd.jieling.protocols.FightData fightData = 5; + private com.ljsd.jieling.protocols.CommonProto.FightData fightData_ = com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.FightData, com.ljsd.jieling.protocols.CommonProto.FightData.Builder, com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder> fightDataBuilder_; + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+       *战斗数据
+       * 
+ */ + public boolean hasFightData() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+       *战斗数据
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.FightData getFightData() { + if (fightDataBuilder_ == null) { + return fightData_; + } else { + return fightDataBuilder_.getMessage(); + } + } + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+       *战斗数据
+       * 
+ */ + public Builder setFightData(com.ljsd.jieling.protocols.CommonProto.FightData value) { + if (fightDataBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + fightData_ = value; + onChanged(); + } else { + fightDataBuilder_.setMessage(value); + } + bitField0_ |= 0x00000010; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+       *战斗数据
+       * 
+ */ + public Builder setFightData( + com.ljsd.jieling.protocols.CommonProto.FightData.Builder builderForValue) { + if (fightDataBuilder_ == null) { + fightData_ = builderForValue.build(); + onChanged(); + } else { + fightDataBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000010; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+       *战斗数据
+       * 
+ */ + public Builder mergeFightData(com.ljsd.jieling.protocols.CommonProto.FightData value) { + if (fightDataBuilder_ == null) { + if (((bitField0_ & 0x00000010) == 0x00000010) && + fightData_ != com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance()) { + fightData_ = + com.ljsd.jieling.protocols.CommonProto.FightData.newBuilder(fightData_).mergeFrom(value).buildPartial(); + } else { + fightData_ = value; + } + onChanged(); + } else { + fightDataBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000010; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+       *战斗数据
+       * 
+ */ + public Builder clearFightData() { + if (fightDataBuilder_ == null) { + fightData_ = com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance(); + onChanged(); + } else { + fightDataBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000010); + return this; + } + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+       *战斗数据
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.FightData.Builder getFightDataBuilder() { + bitField0_ |= 0x00000010; + onChanged(); + return getFightDataFieldBuilder().getBuilder(); + } + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+       *战斗数据
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder getFightDataOrBuilder() { + if (fightDataBuilder_ != null) { + return fightDataBuilder_.getMessageOrBuilder(); + } else { + return fightData_; + } + } + /** + * optional .com.ljsd.jieling.protocols.FightData fightData = 5; + * + *
+       *战斗数据
+       * 
+ */ + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.FightData, com.ljsd.jieling.protocols.CommonProto.FightData.Builder, com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder> + getFightDataFieldBuilder() { + if (fightDataBuilder_ == null) { + fightDataBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.FightData, com.ljsd.jieling.protocols.CommonProto.FightData.Builder, com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder>( + fightData_, + getParentForChildren(), + isClean()); + fightData_ = null; + } + return fightDataBuilder_; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.SweepRightResponse) } @@ -22640,61 +23003,64 @@ public final class FightInfoProto { "\005\022\016\n\006testXY\030\t \001(\005\"l\n\021SweepRightRequest\022\014" + "\n\004type\030\001 \001(\005\022\017\n\007fightId\030\002 \001(\005\022\013\n\003num\030\003 \001" + "(\005\022\024\n\014targetItemId\030\004 \001(\005\022\025\n\rtargetItemNu", - "m\030\005 \001(\005\"|\n\022SweepRightResponse\022.\n\004Drop\030\001 " + - "\003(\0132 .com.ljsd.jieling.protocols.Drop\0226\n" + - "\010ItemInfo\030\002 \001(\0132$.com.ljsd.jieling.proto" + - "cols.ItemInfo\"3\n\022FightRePlayRequest\022\014\n\004t" + - "ype\030\001 \001(\005\022\017\n\007fightId\030\002 \001(\t\"O\n\023FightRePla" + - "yResponse\0228\n\tfightData\030\001 \001(\0132%.com.ljsd." + - "jieling.protocols.FightData\";\n\031TakeAvent" + - "ureRewardRequest\022\014\n\004type\030\001 \001(\005\022\020\n\010positi" + - "on\030\002 \001(\005\"\202\001\n\032TakeAventureRewardResponse\022" + - ".\n\004Drop\030\001 \001(\0132 .com.ljsd.jieling.protoco", - "ls.Drop\0224\n\nrandomDrop\030\002 \001(\0132 .com.ljsd.j" + - "ieling.protocols.Drop\"*\n\027AdventureUpLeve" + - "lRequest\022\017\n\007arenaId\030\001 \001(\005\"O\n\031AdventurnCh" + - "allengeRequest\022\017\n\007arenaId\030\001 \001(\005\022\016\n\006teamI" + - "d\030\002 \001(\005\022\021\n\tskipFight\030\003 \001(\005\"k\n\032AdventurnC" + - "hallengeResponse\022\023\n\013fightResult\030\001 \001(\005\0228\n" + - "\tfightData\030\002 \001(\0132%.com.ljsd.jieling.prot" + - "ocols.FightData\"e\n\031AdventureBossInfoResp" + - "onse\022H\n\021adventureBossInfo\030\001 \003(\0132-.com.lj" + - "sd.jieling.protocols.AdventureBossInfo\"g", - "\n\036AdventurenBossChallengeRequest\022\016\n\006boss" + - "Id\030\001 \001(\t\022\016\n\006teamId\030\002 \001(\005\022\022\n\nfightTimes\030\003" + - " \001(\005\022\021\n\tskipFight\030\004 \001(\005\"\335\001\n\037AdventurenBo" + - "ssChallengeResponse\022\020\n\010hurtNums\030\001 \001(\005\0228\n" + - "\tfightData\030\002 \001(\0132%.com.ljsd.jieling.prot" + - "ocols.FightData\022\023\n\013fightResult\030\003 \001(\005\022\031\n\021" + - "consumeFightTimes\030\004 \001(\005\022\023\n\013killRewards\030\005" + - " \001(\t\022\023\n\013bossTotalHp\030\006 \001(\005\022\024\n\014bossRemainH" + - "p\030\007 \001(\005\":\n\033AdventureBossKillIndication\022\013" + - "\n\003pos\030\001 \001(\005\022\016\n\006bossId\030\002 \001(\t\"+\n\031Adventure", - "BossShareRequest\022\016\n\006bossId\030\001 \001(\t\"$\n\024Adve" + - "nturnRankRequest\022\014\n\004page\030\001 \001(\005\"\254\001\n\025Adven" + - "turnRankResponse\022P\n\025adventureRankItemInf" + - "o\030\001 \003(\01321.com.ljsd.jieling.protocols.Adv" + - "entureRankItemInfo\022A\n\006myInfo\030\002 \001(\01321.com" + - ".ljsd.jieling.protocols.AdventureRankIte" + - "mInfo\"g\n\033AdventureBossFindIndication\022H\n\021" + - "adventureBossInfo\030\001 \001(\0132-.com.ljsd.jieli" + - "ng.protocols.AdventureBossInfo\"$\n\024Advent" + - "ureLeftRequest\022\014\n\004type\030\001 \001(\005\"e\n\031Adventur", - "eCallBossResponse\022H\n\021adventureBossInfo\030\001" + - " \001(\0132-.com.ljsd.jieling.protocols.Advent" + - "ureBossInfo\"@\n\035QuickStartMonsterFightReq" + - "uest\022\017\n\007fightId\030\001 \001(\005\022\016\n\006teamId\030\002 \001(\005\"\240\001" + - "\n\036QuickStartMonsterFightResponse\022\016\n\006resu" + - "lt\030\001 \001(\005\0224\n\nenventDrop\030\002 \001(\0132 .com.ljsd." + - "jieling.protocols.Drop\0228\n\tfightData\030\003 \001(" + - "\0132%.com.ljsd.jieling.protocols.FightData" + - "\"\261\001\n\031MainLevelRankInfoResponse\022H\n\021MainLe" + - "velRankInfo\030\001 \003(\0132-.com.ljsd.jieling.pro", - "tocols.MainLevelRankInfo\022J\n\023myMainLevelR" + - "ankInfo\030\002 \001(\0132-.com.ljsd.jieling.protoco" + - "ls.MainLevelRankInfo\"@\n\036MainLevelFightUp" + - "dateIndication\022\017\n\007fightId\030\001 \001(\005\022\r\n\005state" + - "\030\002 \001(\005B\002H\001" + "m\030\005 \001(\005\"\372\001\n\022SweepRightResponse\022.\n\004Drop\030\001" + + " \001(\0132 .com.ljsd.jieling.protocols.Drop\0224" + + "\n\nrandomDrop\030\002 \001(\0132 .com.ljsd.jieling.pr" + + "otocols.Drop\0226\n\010ItemInfo\030\003 \001(\0132$.com.ljs" + + "d.jieling.protocols.ItemInfo\022\014\n\004hurt\030\004 \001" + + "(\005\0228\n\tfightData\030\005 \001(\0132%.com.ljsd.jieling" + + ".protocols.FightData\"3\n\022FightRePlayReque" + + "st\022\014\n\004type\030\001 \001(\005\022\017\n\007fightId\030\002 \001(\t\"O\n\023Fig" + + "htRePlayResponse\0228\n\tfightData\030\001 \001(\0132%.co" + + "m.ljsd.jieling.protocols.FightData\";\n\031Ta", + "keAventureRewardRequest\022\014\n\004type\030\001 \001(\005\022\020\n" + + "\010position\030\002 \001(\005\"\202\001\n\032TakeAventureRewardRe" + + "sponse\022.\n\004Drop\030\001 \001(\0132 .com.ljsd.jieling." + + "protocols.Drop\0224\n\nrandomDrop\030\002 \001(\0132 .com" + + ".ljsd.jieling.protocols.Drop\"*\n\027Adventur" + + "eUpLevelRequest\022\017\n\007arenaId\030\001 \001(\005\"O\n\031Adve" + + "nturnChallengeRequest\022\017\n\007arenaId\030\001 \001(\005\022\016" + + "\n\006teamId\030\002 \001(\005\022\021\n\tskipFight\030\003 \001(\005\"k\n\032Adv" + + "enturnChallengeResponse\022\023\n\013fightResult\030\001" + + " \001(\005\0228\n\tfightData\030\002 \001(\0132%.com.ljsd.jieli", + "ng.protocols.FightData\"e\n\031AdventureBossI" + + "nfoResponse\022H\n\021adventureBossInfo\030\001 \003(\0132-" + + ".com.ljsd.jieling.protocols.AdventureBos" + + "sInfo\"g\n\036AdventurenBossChallengeRequest\022" + + "\016\n\006bossId\030\001 \001(\t\022\016\n\006teamId\030\002 \001(\005\022\022\n\nfight" + + "Times\030\003 \001(\005\022\021\n\tskipFight\030\004 \001(\005\"\335\001\n\037Adven" + + "turenBossChallengeResponse\022\020\n\010hurtNums\030\001" + + " \001(\005\0228\n\tfightData\030\002 \001(\0132%.com.ljsd.jieli" + + "ng.protocols.FightData\022\023\n\013fightResult\030\003 " + + "\001(\005\022\031\n\021consumeFightTimes\030\004 \001(\005\022\023\n\013killRe", + "wards\030\005 \001(\t\022\023\n\013bossTotalHp\030\006 \001(\005\022\024\n\014boss" + + "RemainHp\030\007 \001(\005\":\n\033AdventureBossKillIndic" + + "ation\022\013\n\003pos\030\001 \001(\005\022\016\n\006bossId\030\002 \001(\t\"+\n\031Ad" + + "ventureBossShareRequest\022\016\n\006bossId\030\001 \001(\t\"" + + "$\n\024AdventurnRankRequest\022\014\n\004page\030\001 \001(\005\"\254\001" + + "\n\025AdventurnRankResponse\022P\n\025adventureRank" + + "ItemInfo\030\001 \003(\01321.com.ljsd.jieling.protoc" + + "ols.AdventureRankItemInfo\022A\n\006myInfo\030\002 \001(" + + "\01321.com.ljsd.jieling.protocols.Adventure" + + "RankItemInfo\"g\n\033AdventureBossFindIndicat", + "ion\022H\n\021adventureBossInfo\030\001 \001(\0132-.com.ljs" + + "d.jieling.protocols.AdventureBossInfo\"$\n" + + "\024AdventureLeftRequest\022\014\n\004type\030\001 \001(\005\"e\n\031A" + + "dventureCallBossResponse\022H\n\021adventureBos" + + "sInfo\030\001 \001(\0132-.com.ljsd.jieling.protocols" + + ".AdventureBossInfo\"@\n\035QuickStartMonsterF" + + "ightRequest\022\017\n\007fightId\030\001 \001(\005\022\016\n\006teamId\030\002" + + " \001(\005\"\240\001\n\036QuickStartMonsterFightResponse\022" + + "\016\n\006result\030\001 \001(\005\0224\n\nenventDrop\030\002 \001(\0132 .co" + + "m.ljsd.jieling.protocols.Drop\0228\n\tfightDa", + "ta\030\003 \001(\0132%.com.ljsd.jieling.protocols.Fi" + + "ghtData\"\261\001\n\031MainLevelRankInfoResponse\022H\n" + + "\021MainLevelRankInfo\030\001 \003(\0132-.com.ljsd.jiel" + + "ing.protocols.MainLevelRankInfo\022J\n\023myMai" + + "nLevelRankInfo\030\002 \001(\0132-.com.ljsd.jieling." + + "protocols.MainLevelRankInfo\"@\n\036MainLevel" + + "FightUpdateIndication\022\017\n\007fightId\030\001 \001(\005\022\r" + + "\n\005state\030\002 \001(\005B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -22748,7 +23114,7 @@ public final class FightInfoProto { internal_static_com_ljsd_jieling_protocols_SweepRightResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SweepRightResponse_descriptor, - new java.lang.String[] { "Drop", "ItemInfo", }); + new java.lang.String[] { "Drop", "RandomDrop", "ItemInfo", "Hurt", "FightData", }); internal_static_com_ljsd_jieling_protocols_FightRePlayRequest_descriptor = getDescriptor().getMessageTypes().get(8); internal_static_com_ljsd_jieling_protocols_FightRePlayRequest_fieldAccessorTable = new 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 ec78edf94..193810aee 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/MessageTypeProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/MessageTypeProto.java @@ -3028,6 +3028,90 @@ public final class MessageTypeProto { * WORKSHOP_TECHNOLOGY_RESET_RESPONSE = 12213; */ WORKSHOP_TECHNOLOGY_RESET_RESPONSE(482, 12213), + /** + * EXPEDITION_GET_EXPEDITION_REQUEST = 20002; + * + *
+     *获取节点信息
+     * 
+ */ + EXPEDITION_GET_EXPEDITION_REQUEST(483, 20002), + /** + * EXPEDITION_GET_EXPEDITION_RESONSE = 20003; + */ + EXPEDITION_GET_EXPEDITION_RESONSE(484, 20003), + /** + * EXPEDITION_TAKE_BOXREWARD_REQUEST = 20004; + * + *
+     *获取层级奖励
+     * 
+ */ + EXPEDITION_TAKE_BOXREWARD_REQUEST(485, 20004), + /** + * EXPEDITION_TAKE_BOXREWARD_RESONSE = 20005; + */ + EXPEDITION_TAKE_BOXREWARD_RESONSE(486, 20005), + /** + * EXPEDITION_RELIVE_HERO_REQUEST = 20006; + * + *
+     *复活英雄
+     * 
+ */ + EXPEDITION_RELIVE_HERO_REQUEST(487, 20006), + /** + * EXPEDITION_RELIVE_HERO_RESONSE = 20007; + */ + EXPEDITION_RELIVE_HERO_RESONSE(488, 20007), + /** + * EXPEDITION_START_BATTLE_REQUEST = 20008; + * + *
+     *开始节点战斗操作
+     * 
+ */ + EXPEDITION_START_BATTLE_REQUEST(489, 20008), + /** + * EXPEDITION_START_BATTLE_RESONSE = 20009; + */ + EXPEDITION_START_BATTLE_RESONSE(490, 20009), + /** + * EXPEDITION_END_BATTLE_REQUEST = 20010; + * + *
+     *结束节点战斗操作
+     * 
+ */ + EXPEDITION_END_BATTLE_REQUEST(491, 20010), + /** + * EXPEDITION_END_BATTLE_RESONSE = 20011; + */ + EXPEDITION_END_BATTLE_RESONSE(492, 20011), + /** + * EXPEDITION_TAKE_HOLY_EQUIP_REQUEST = 20012; + * + *
+     *领取圣物
+     * 
+ */ + EXPEDITION_TAKE_HOLY_EQUIP_REQUEST(493, 20012), + /** + * EXPEDITION_TAKE_HOLY_EQUIP_RESONSE = 20013; + */ + EXPEDITION_TAKE_HOLY_EQUIP_RESONSE(494, 20013), + /** + * EXPEDITION_RECOVER_HERO_REQUEST = 20014; + * + *
+     *恢复英雄
+     * 
+ */ + EXPEDITION_RECOVER_HERO_REQUEST(495, 20014), + /** + * EXPEDITION_RECOVER_HERO_RESONSE = 20015; + */ + EXPEDITION_RECOVER_HERO_RESONSE(496, 20015), ; /** @@ -6045,6 +6129,90 @@ public final class MessageTypeProto { * WORKSHOP_TECHNOLOGY_RESET_RESPONSE = 12213; */ public static final int WORKSHOP_TECHNOLOGY_RESET_RESPONSE_VALUE = 12213; + /** + * EXPEDITION_GET_EXPEDITION_REQUEST = 20002; + * + *
+     *获取节点信息
+     * 
+ */ + public static final int EXPEDITION_GET_EXPEDITION_REQUEST_VALUE = 20002; + /** + * EXPEDITION_GET_EXPEDITION_RESONSE = 20003; + */ + public static final int EXPEDITION_GET_EXPEDITION_RESONSE_VALUE = 20003; + /** + * EXPEDITION_TAKE_BOXREWARD_REQUEST = 20004; + * + *
+     *获取层级奖励
+     * 
+ */ + public static final int EXPEDITION_TAKE_BOXREWARD_REQUEST_VALUE = 20004; + /** + * EXPEDITION_TAKE_BOXREWARD_RESONSE = 20005; + */ + public static final int EXPEDITION_TAKE_BOXREWARD_RESONSE_VALUE = 20005; + /** + * EXPEDITION_RELIVE_HERO_REQUEST = 20006; + * + *
+     *复活英雄
+     * 
+ */ + public static final int EXPEDITION_RELIVE_HERO_REQUEST_VALUE = 20006; + /** + * EXPEDITION_RELIVE_HERO_RESONSE = 20007; + */ + public static final int EXPEDITION_RELIVE_HERO_RESONSE_VALUE = 20007; + /** + * EXPEDITION_START_BATTLE_REQUEST = 20008; + * + *
+     *开始节点战斗操作
+     * 
+ */ + public static final int EXPEDITION_START_BATTLE_REQUEST_VALUE = 20008; + /** + * EXPEDITION_START_BATTLE_RESONSE = 20009; + */ + public static final int EXPEDITION_START_BATTLE_RESONSE_VALUE = 20009; + /** + * EXPEDITION_END_BATTLE_REQUEST = 20010; + * + *
+     *结束节点战斗操作
+     * 
+ */ + public static final int EXPEDITION_END_BATTLE_REQUEST_VALUE = 20010; + /** + * EXPEDITION_END_BATTLE_RESONSE = 20011; + */ + public static final int EXPEDITION_END_BATTLE_RESONSE_VALUE = 20011; + /** + * EXPEDITION_TAKE_HOLY_EQUIP_REQUEST = 20012; + * + *
+     *领取圣物
+     * 
+ */ + public static final int EXPEDITION_TAKE_HOLY_EQUIP_REQUEST_VALUE = 20012; + /** + * EXPEDITION_TAKE_HOLY_EQUIP_RESONSE = 20013; + */ + public static final int EXPEDITION_TAKE_HOLY_EQUIP_RESONSE_VALUE = 20013; + /** + * EXPEDITION_RECOVER_HERO_REQUEST = 20014; + * + *
+     *恢复英雄
+     * 
+ */ + public static final int EXPEDITION_RECOVER_HERO_REQUEST_VALUE = 20014; + /** + * EXPEDITION_RECOVER_HERO_RESONSE = 20015; + */ + public static final int EXPEDITION_RECOVER_HERO_RESONSE_VALUE = 20015; public final int getNumber() { return value; } @@ -6534,6 +6702,20 @@ public final class MessageTypeProto { case 12211: return WORKSHOP_TECHNOLOGY_RESPONSE; case 12212: return WORKSHOP_TECHNOLOGY_RESET_REQUEST; case 12213: return WORKSHOP_TECHNOLOGY_RESET_RESPONSE; + case 20002: return EXPEDITION_GET_EXPEDITION_REQUEST; + case 20003: return EXPEDITION_GET_EXPEDITION_RESONSE; + case 20004: return EXPEDITION_TAKE_BOXREWARD_REQUEST; + case 20005: return EXPEDITION_TAKE_BOXREWARD_RESONSE; + case 20006: return EXPEDITION_RELIVE_HERO_REQUEST; + case 20007: return EXPEDITION_RELIVE_HERO_RESONSE; + case 20008: return EXPEDITION_START_BATTLE_REQUEST; + case 20009: return EXPEDITION_START_BATTLE_RESONSE; + case 20010: return EXPEDITION_END_BATTLE_REQUEST; + case 20011: return EXPEDITION_END_BATTLE_RESONSE; + case 20012: return EXPEDITION_TAKE_HOLY_EQUIP_REQUEST; + case 20013: return EXPEDITION_TAKE_HOLY_EQUIP_RESONSE; + case 20014: return EXPEDITION_RECOVER_HERO_REQUEST; + case 20015: return EXPEDITION_RECOVER_HERO_RESONSE; default: return null; } } @@ -6595,7 +6777,7 @@ public final class MessageTypeProto { static { java.lang.String[] descriptorData = { "\n\026MessageTypeProto.proto\022\032com.ljsd.jieli" + - "ng.protocols*\334y\n\013MessageType\022\027\n\022HEART_BE" + + "ng.protocols*\206~\n\013MessageType\022\027\n\022HEART_BE" + "AT_REQUEST\020\350\007\022\030\n\023HEART_BEAT_RESPONSE\020\351\007\022" + "\036\n\031ACTIVITE_WORKSHOP_REQUEST\020\224N\022\037\n\032ACTIV" + "ITE_WORKSHOP_RESPONSE\020\225N\022\027\n\022ARENA_INFO_R" + @@ -6984,7 +7166,21 @@ public final class MessageTypeProto { "&\n!WORKSHOP_TECHNOLOGY_LEVEL_REQUEST\020\262_\022" + "!\n\034WORKSHOP_TECHNOLOGY_RESPONSE\020\263_\022&\n!WO" + "RKSHOP_TECHNOLOGY_RESET_REQUEST\020\264_\022\'\n\"WO", - "RKSHOP_TECHNOLOGY_RESET_RESPONSE\020\265_B\002H\001" + "RKSHOP_TECHNOLOGY_RESET_RESPONSE\020\265_\022\'\n!E" + + "XPEDITION_GET_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!EXPEDITION_TAKE_BOXREWARD_RESONSE\020\245\234\001\022" + + "$\n\036EXPEDITION_RELIVE_HERO_REQUEST\020\246\234\001\022$\n" + + "\036EXPEDITION_RELIVE_HERO_RESONSE\020\247\234\001\022%\n\037E" + + "XPEDITION_START_BATTLE_REQUEST\020\250\234\001\022%\n\037EX" + + "PEDITION_START_BATTLE_RESONSE\020\251\234\001\022#\n\035EXP" + + "EDITION_END_BATTLE_REQUEST\020\252\234\001\022#\n\035EXPEDI", + "TION_END_BATTLE_RESONSE\020\253\234\001\022(\n\"EXPEDITIO" + + "N_TAKE_HOLY_EQUIP_REQUEST\020\254\234\001\022(\n\"EXPEDIT" + + "ION_TAKE_HOLY_EQUIP_RESONSE\020\255\234\001\022%\n\037EXPED" + + "ITION_RECOVER_HERO_REQUEST\020\256\234\001\022%\n\037EXPEDI" + + "TION_RECOVER_HERO_RESONSE\020\257\234\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/db/redis/RedisKey.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java index 94cf27310..8f745ea9a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java @@ -230,6 +230,7 @@ public class RedisKey { public final static String PIDGIDTEMP = "PIDGIDTEMP"; public final static String GUILDBOSS_ARENA_RECORD = "GUILDBOSS_ARENA_RECORD"; + public final static String GUILDBOSS_PER_ARENA_RECORD = "GUILDBOSS_PER_ARENA_RECORD"; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java b/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java index 643595cf3..19fe84e28 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java @@ -127,7 +127,7 @@ public enum ErrorCode implements IErrorCode { ITEM_DECOMPOSE_SOULE_IN(92,"已穿戴"), ITEM_DECOMPOSE_SOULE_CANT(93,"不可分解"), MAP_SWEEP_CANT(94,"该副本不可扫荡"), - MAP_SWEEP_START_NOT(95,"sweep 未三星通关"), + MAP_SWEEP_START_NOT(95,"sweepBossFight 未三星通关"), MAP_SWEEP_NO(96,"未通关"), MAP_SWEEP_OPENRULE_NULL(97,"功绩不足"), BLOOD_BUY_SCORE_YET(98,"已购买"), 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 3b99501c0..e8d5fbcd9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -101,7 +101,8 @@ public interface BIReason { int CHAMPIION_BET_WIN_REWARD = 60 ; // 巅峰赛竞猜赢取 - int GUILD_BOSS_FIGHT_REWARD = 61;//工会boss奖励 + int GUILD_BOSS_FIGHT_BASE_REWARD = 61;//工会boss基础奖励 + int GUILD_BOSS_FIGHT_RANDOM_REWARD = 61;//工会boss随机奖励 int CHAMPIONM_EXCHANGE_REWARD = 1050;//巅峰赛兑换奖励 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 6536c7c09..0086621c5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -1870,7 +1870,7 @@ public class MapLogic { if(sChallengeConfig.getSweepingOpenRule()[0]==1){ CrossInfo crossInfo = mapManager.getCrossInfoMap().get(mapId); if (null == crossInfo||crossInfo.getStars().size() < sChallengeConfig.getSweepingOpenRule()[1]) { - throw new ErrorCodeException(ErrorCode.newDefineCode("sweep 未三星通关")); + throw new ErrorCodeException(ErrorCode.newDefineCode("sweepBossFight 未三星通关")); } }else if(sChallengeConfig.getSweepingOpenRule()[0]==2){ CrossInfo crossInfo = mapManager.getCrossInfoMap().get(mapId); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/SweepRightRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/SweepRightRequestHandler.java index f1d356f83..438b21992 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/SweepRightRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/SweepRightRequestHandler.java @@ -2,6 +2,7 @@ package com.ljsd.jieling.handler.map.mapHandler; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.handler.map.SweepLogic; +import com.ljsd.jieling.logic.family.GuildFightLogic; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.FightInfoProto; @@ -27,6 +28,7 @@ public class SweepRightRequestHandler extends BaseHandler{ if (type == 1){ //关卡扫荡 SweepLogic.getInstance().sweepFight(iSession,fightId,sweepTimes,targetItemId,targetItemNum, MessageTypeProto.MessageType.SWEEP_RIGHT_RESPONSE); }else if(type == 2){ // 工会boss扫荡 + GuildFightLogic.sweepBossFight(iSession); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 1f19f21f2..5b1b63fc1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -46,6 +46,7 @@ import com.ljsd.jieling.util.MessageUtil; import config.SDailyTasksConfig; import config.SEndlessDifficulty; import config.SGlobalSystemConfig; +import config.SRechargeCommodityConfig; import manager.STableManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -326,7 +327,7 @@ public class GlobalDataManaager implements IManager { user.getUserMissionManager().onGameEvent(user, GameEvent.DAILY_REFRESH,0); user.getUserMissionManager().onGameEvent(user, GameEvent.BLOODY_REFRESH,0); FriendLogic.getInstance().refreshState(session); - + flushGoodsTimes(user); PlayerLogic.getInstance().sendTimingMail(user); user.getGuildMyInfo().setLastHurt(0); @@ -351,6 +352,24 @@ public class GlobalDataManaager implements IManager { } } + public static void flushGoodsTimes(User user){ + Map buyGoodsTimes = user.getPlayerInfoManager().getRechargeInfo().getBuyGoodsTimes(); + if(buyGoodsTimes!=null && buyGoodsTimes.isEmpty()){ + Iterator iterator = buyGoodsTimes.keySet().iterator(); + boolean update = false; + while (iterator.hasNext()){ + Integer goodsId = iterator.next(); + if(SRechargeCommodityConfig.rechargeCommodityConfigMap.get(goodsId).getDailyUpdate() == 1){ + buyGoodsTimes.put(goodsId,0); + update =true; + } + } + if(update){ + user.getPlayerInfoManager().getRechargeInfo().setBuyGoodsTimes(buyGoodsTimes); + } + } + } + public static void everTask(int hour){ Map sessionMap = OnlineUserManager.sessionMap; int number = 0; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index dd58ec1fb..690e53ab6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -1090,29 +1090,56 @@ public class GuildFightLogic { if(myHurt>user.getGuildMyInfo().getMaxBossHurt()){ user.getGuildMyInfo().setMaxBossHurt(myHurt); } + ArenaRecord arenaRecord = new ArenaRecord(); + arenaRecord.setFightData(fightResult.getFightData().toByteArray()); + RedisUtil.getInstence().set(RedisKey.GUILDBOSS_PER_ARENA_RECORD, Integer.toString(uid),arenaRecord); if(myHurt>user.getGuildMyInfo().getLastHurt()){ //排行榜更新 String rkey = user.getPlayerInfoManager().getGuildId() + RedisKey.Delimiter_colon + bossSeason; double scoreById = RankEnum.toRank(RankEnum.GUILD_BOSS_RANK.getType()).getScoreById(uid, rkey); if(myHurt>scoreById){ RankEnum.toRank(RankEnum.GUILD_BOSS_RANK.getType()).addRank(uid,rkey,myHurt); - ArenaRecord arenaRecord = new ArenaRecord(); - arenaRecord.setFightData(fightResult.getFightData().toByteArray()); RedisUtil.getInstence().set(RedisKey.GUILDBOSS_ARENA_RECORD, Integer.toString(uid),arenaRecord); } } user.getGuildMyInfo().setLastHurt(myHurt); SGuildBossRewardConfig sGuildBossRewardConfig = SGuildBossRewardConfig.getIndexByHurt(myHurt); - CommonProto.Drop.Builder drop = ItemUtil.drop(user, sGuildBossRewardConfig.getReward(), 1, 0, BIReason.GUILD_BOSS_FIGHT_REWARD); + int randomGroupId = MathUtils.randomFromWeight(sGuildBossRewardConfig.getRandomReward()); + CommonProto.Drop.Builder drop = ItemUtil.drop(user, sGuildBossRewardConfig.getReward(), 1, 0, BIReason.GUILD_BOSS_FIGHT_BASE_REWARD); + CommonProto.Drop.Builder raadomDrop = ItemUtil.drop(user, new int[]{randomGroupId}, 1, 0, BIReason.GUILD_BOSS_FIGHT_RANDOM_REWARD); FightInfoProto.FightEndResponse.Builder fightEndResponse = FightInfoProto.FightEndResponse.newBuilder(); fightEndResponse.setEnventDrop(drop); + fightEndResponse.setMissionDrop(raadomDrop); fightEndResponse.setEssenceValue(myHurt); fightEndResponse.build(); MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true); } + public static void sweepBossFight(ISession session) throws Exception { + int uid = session.getUid(); + User user = UserManager.getUser(uid); + int lastHurt = user.getGuildMyInfo().getLastHurt(); + boolean allow = PlayerLogic.getInstance().checkAndUpdate(user, VipPrivilegeType.UNLOCK_GUILD_BOSS_SWEEP, 1); + if(!allow){ + throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); + } + allow = PlayerLogic.getInstance().checkAndUpdate(user, VipPrivilegeType.GUILD_BOSS_CHALLENGE_TIMES, 1); + if(!allow){ + throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); + } + ArenaRecord arenaRecord = RedisUtil.getInstence().get(RedisKey.GUILDBOSS_ARENA_RECORD, String.valueOf(uid), ArenaRecord.class); + byte[] fightData = arenaRecord.getFightData(); + CommonProto.FightData fightDataProto = CommonProto.FightData.parseFrom(fightData); + SGuildBossRewardConfig sGuildBossRewardConfig = SGuildBossRewardConfig.getIndexByHurt(lastHurt); + int randomGroupId = MathUtils.randomFromWeight(sGuildBossRewardConfig.getRandomReward()); + CommonProto.Drop.Builder drop = ItemUtil.drop(user, sGuildBossRewardConfig.getReward(), 1, 0, BIReason.GUILD_BOSS_FIGHT_BASE_REWARD); + CommonProto.Drop.Builder raadomDrop = ItemUtil.drop(user, new int[]{randomGroupId}, 1, 0, BIReason.GUILD_BOSS_FIGHT_RANDOM_REWARD); + FightInfoProto.SweepRightResponse build = FightInfoProto.SweepRightResponse.newBuilder().setDrop(drop).setRandomDrop(raadomDrop).setFightData(fightDataProto).setHurt(lastHurt).build(); + MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.SWEEP_RIGHT_RESPONSE_VALUE,build, true); + } + public static void updateGuildBossInfoByTimes(int times) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index c2f96b559..fc4836cb3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -85,11 +85,7 @@ public class BuyGoodsLogic { if(buyCount ==null){ buyCount = 0; } - int isDiscount = sRechargeCommodityConfig.getIsDiscount(); int price =sRechargeCommodityConfig.getPrice(); - if(isDiscount!=0){ - price=(int)(sRechargeCommodityConfig.getPrice() * (10 + isDiscount)/10f); - } buyCount=buyCount+1; int limit = sRechargeCommodityConfig.getLimit(); int type = sRechargeCommodityConfig.getType(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/http/HttpPool.java b/serverlogic/src/main/java/com/ljsd/jieling/util/http/HttpPool.java index 71cfbbd5f..b4c896194 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/http/HttpPool.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/http/HttpPool.java @@ -129,7 +129,7 @@ public class HttpPool { public static void main (String [] args){ Gson gson = new Gson(); - String send ="{\"gid\":\"jl_test\",\"time\":1562317800,\"sign\":\"cc4c130e9c6ee66a54ed7cc380a9abbd\",\"jsonStrs\":\"[{\\\"param_data\\\":{\\\"app_id_s\\\":\\\"jl_test\\\",\\\"category_s\\\":\\\"event_app\\\",\\\"platform_s\\\":\\\"ADR\\\",\\\"region_s\\\":\\\"4\\\",\\\"server_s\\\":\\\"50215\\\",\\\"channel_s\\\":\\\"pc\\\",\\\"data_unix\\\":1562317800},\\\"param_event\\\":{\\\"event_s\\\":[\\\"online_0_unix_l\\\",\\\"1562317800\\\",\\\"0\\\"]}}]\"}"; + String send ="{\"param_data\":{\"app_id_s\":\"jl_test\",\"category_s\":\"event_role\",\"platform_s\":\"ADR\",\"region_s\":\"60215\",\"server_s\":\"60215\",\"channel_s\":\"#\",\"data_unix\":1578542089},\"param_environment\":{\"idfa_s\":\"\",\"imei_s\":\"\",\"app_device_id_s\":\"\",\"brand_s\":\"\",\"dpi_s\":\"\",\"operator_s\":\"\",\"os_version_s\":\"\",\"wifi_b\":false},\"param_user\":{\"user_id_s\":\"w7ww\",\"account_id_s\":\"10040506\"},\"param_role\":{\"role_id_s\":\"10040506\",\"role_name_s\":\"10040506\",\"level_i\":\"100\",\"vip_level_i\":0,\"currency_1_d\":\"9899\",\"currency_2_d\":\"41464\",\"eco_force_11_a\":\"[315870,250891,0,0,0,0,0,0,0,0,0]\"},\"param_event\":{\"event_s\":[\"login_1\",\"LOGOUT\"]}}"; init(); KTSendBody sendBody = gson.fromJson(send, KTSendBody.class); sendPost("https://gskuld.receiver.extranet.kt007.com:8081/skuld/game/common/",send); diff --git a/tablemanager/src/main/java/config/SGuildBossRewardConfig.java b/tablemanager/src/main/java/config/SGuildBossRewardConfig.java index ee2c21f3d..45b755af9 100644 --- a/tablemanager/src/main/java/config/SGuildBossRewardConfig.java +++ b/tablemanager/src/main/java/config/SGuildBossRewardConfig.java @@ -15,6 +15,8 @@ public class SGuildBossRewardConfig implements BaseConfig { private int[] reward; + private int[][] randomReward; + private static TreeMap sGuildBossHurtRewardConfig; @@ -43,5 +45,7 @@ public class SGuildBossRewardConfig implements BaseConfig { return reward; } - + public int[][] getRandomReward() { + return randomReward; + } } \ No newline at end of file diff --git a/tablemanager/src/main/java/config/SRechargeCommodityConfig.java b/tablemanager/src/main/java/config/SRechargeCommodityConfig.java index c775173b3..ad9aa302a 100644 --- a/tablemanager/src/main/java/config/SRechargeCommodityConfig.java +++ b/tablemanager/src/main/java/config/SRechargeCommodityConfig.java @@ -53,6 +53,10 @@ public class SRechargeCommodityConfig implements BaseConfig { private int limitShow; + private int dailyUpdate; + + + public static Map rechargeCommodityConfigMap; public static Map rechargeLevelMap; private static Set rchargeHeroGet; @@ -200,6 +204,10 @@ public class SRechargeCommodityConfig implements BaseConfig { return limitShow; } + public int getDailyUpdate() { + return dailyUpdate; + } + public static Set getRchargeHeroGet() { return rchargeHeroGet; }