From bf845f4fbf1acd1de18bc22097609dd8d84e5823 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 7 May 2020 18:06:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BD=AE=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/protocols/Family.java | 1686 +++++++++++++++-- .../com/ljsd/jieling/db/redis/RedisKey.java | 2 + .../jieling/handler/FastChallengeHandler.java | 6 + .../family/GetCarChallengeListHandler.java | 111 +- .../jieling/logic/family/GuildFightLogic.java | 28 +- 5 files changed, 1590 insertions(+), 243 deletions(-) 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 2b003c348..5ec468959 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java @@ -44719,32 +44719,1288 @@ public final class Family { // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ResetGuildSkillResponse) } + public interface CarChallengeItemOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional int32 uid = 1; + /** + * optional int32 uid = 1; + */ + boolean hasUid(); + /** + * optional int32 uid = 1; + */ + int getUid(); + + // optional string userName = 2; + /** + * optional string userName = 2; + */ + boolean hasUserName(); + /** + * optional string userName = 2; + */ + java.lang.String getUserName(); + /** + * optional string userName = 2; + */ + com.google.protobuf.ByteString + getUserNameBytes(); + + // optional int32 force = 3; + /** + * optional int32 force = 3; + */ + boolean hasForce(); + /** + * optional int32 force = 3; + */ + int getForce(); + + // optional string guildName = 4; + /** + * optional string guildName = 4; + */ + boolean hasGuildName(); + /** + * optional string guildName = 4; + */ + java.lang.String getGuildName(); + /** + * optional string guildName = 4; + */ + com.google.protobuf.ByteString + getGuildNameBytes(); + + // optional int32 score = 5; + /** + * optional int32 score = 5; + */ + boolean hasScore(); + /** + * optional int32 score = 5; + */ + int getScore(); + + // optional int32 hadChallenge = 6; + /** + * optional int32 hadChallenge = 6; + * + *
+     * 是否已挑战过,1:表示挑战过,2:未挑战过。
+     * 
+ */ + boolean hasHadChallenge(); + /** + * optional int32 hadChallenge = 6; + * + *
+     * 是否已挑战过,1:表示挑战过,2:未挑战过。
+     * 
+ */ + int getHadChallenge(); + + // optional int32 rank = 7; + /** + * optional int32 rank = 7; + */ + boolean hasRank(); + /** + * optional int32 rank = 7; + */ + int getRank(); + + // optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + boolean hasTeamInfo(); + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getTeamInfo(); + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getTeamInfoOrBuilder(); + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.CarChallengeItem} + */ + public static final class CarChallengeItem extends + com.google.protobuf.GeneratedMessage + implements CarChallengeItemOrBuilder { + // Use CarChallengeItem.newBuilder() to construct. + private CarChallengeItem(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private CarChallengeItem(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final CarChallengeItem defaultInstance; + public static CarChallengeItem getDefaultInstance() { + return defaultInstance; + } + + public CarChallengeItem getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private CarChallengeItem( + 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; + uid_ = input.readInt32(); + break; + } + case 18: { + bitField0_ |= 0x00000002; + userName_ = input.readBytes(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + force_ = input.readInt32(); + break; + } + case 34: { + bitField0_ |= 0x00000008; + guildName_ = input.readBytes(); + break; + } + case 40: { + bitField0_ |= 0x00000010; + score_ = input.readInt32(); + break; + } + case 48: { + bitField0_ |= 0x00000020; + hadChallenge_ = input.readInt32(); + break; + } + case 56: { + bitField0_ |= 0x00000040; + rank_ = input.readInt32(); + break; + } + case 66: { + com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder subBuilder = null; + if (((bitField0_ & 0x00000080) == 0x00000080)) { + subBuilder = teamInfo_.toBuilder(); + } + teamInfo_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(teamInfo_); + teamInfo_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000080; + 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.Family.internal_static_com_ljsd_jieling_protocols_CarChallengeItem_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.Family.internal_static_com_ljsd_jieling_protocols_CarChallengeItem_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.Family.CarChallengeItem.class, com.ljsd.jieling.protocols.Family.CarChallengeItem.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public CarChallengeItem parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CarChallengeItem(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional int32 uid = 1; + public static final int UID_FIELD_NUMBER = 1; + private int uid_; + /** + * optional int32 uid = 1; + */ + public boolean hasUid() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 uid = 1; + */ + public int getUid() { + return uid_; + } + + // optional string userName = 2; + public static final int USERNAME_FIELD_NUMBER = 2; + private java.lang.Object userName_; + /** + * optional string userName = 2; + */ + public boolean hasUserName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional string userName = 2; + */ + public java.lang.String getUserName() { + java.lang.Object ref = userName_; + 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()) { + userName_ = s; + } + return s; + } + } + /** + * optional string userName = 2; + */ + public com.google.protobuf.ByteString + getUserNameBytes() { + java.lang.Object ref = userName_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + userName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + // optional int32 force = 3; + public static final int FORCE_FIELD_NUMBER = 3; + private int force_; + /** + * optional int32 force = 3; + */ + public boolean hasForce() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 force = 3; + */ + public int getForce() { + return force_; + } + + // optional string guildName = 4; + public static final int GUILDNAME_FIELD_NUMBER = 4; + private java.lang.Object guildName_; + /** + * optional string guildName = 4; + */ + public boolean hasGuildName() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional string guildName = 4; + */ + public java.lang.String getGuildName() { + java.lang.Object ref = guildName_; + 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()) { + guildName_ = s; + } + return s; + } + } + /** + * optional string guildName = 4; + */ + public com.google.protobuf.ByteString + getGuildNameBytes() { + java.lang.Object ref = guildName_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + guildName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + // optional int32 score = 5; + public static final int SCORE_FIELD_NUMBER = 5; + private int score_; + /** + * optional int32 score = 5; + */ + public boolean hasScore() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional int32 score = 5; + */ + public int getScore() { + return score_; + } + + // optional int32 hadChallenge = 6; + public static final int HADCHALLENGE_FIELD_NUMBER = 6; + private int hadChallenge_; + /** + * optional int32 hadChallenge = 6; + * + *
+     * 是否已挑战过,1:表示挑战过,2:未挑战过。
+     * 
+ */ + public boolean hasHadChallenge() { + return ((bitField0_ & 0x00000020) == 0x00000020); + } + /** + * optional int32 hadChallenge = 6; + * + *
+     * 是否已挑战过,1:表示挑战过,2:未挑战过。
+     * 
+ */ + public int getHadChallenge() { + return hadChallenge_; + } + + // optional int32 rank = 7; + public static final int RANK_FIELD_NUMBER = 7; + private int rank_; + /** + * optional int32 rank = 7; + */ + public boolean hasRank() { + return ((bitField0_ & 0x00000040) == 0x00000040); + } + /** + * optional int32 rank = 7; + */ + public int getRank() { + return rank_; + } + + // optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + public static final int TEAMINFO_FIELD_NUMBER = 8; + private com.ljsd.jieling.protocols.CommonProto.TeamOneInfo teamInfo_; + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + public boolean hasTeamInfo() { + return ((bitField0_ & 0x00000080) == 0x00000080); + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getTeamInfo() { + return teamInfo_; + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getTeamInfoOrBuilder() { + return teamInfo_; + } + + private void initFields() { + uid_ = 0; + userName_ = ""; + force_ = 0; + guildName_ = ""; + score_ = 0; + hadChallenge_ = 0; + rank_ = 0; + teamInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeInt32(1, uid_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeBytes(2, getUserNameBytes()); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeInt32(3, force_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeBytes(4, getGuildNameBytes()); + } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + output.writeInt32(5, score_); + } + if (((bitField0_ & 0x00000020) == 0x00000020)) { + output.writeInt32(6, hadChallenge_); + } + if (((bitField0_ & 0x00000040) == 0x00000040)) { + output.writeInt32(7, rank_); + } + if (((bitField0_ & 0x00000080) == 0x00000080)) { + output.writeMessage(8, teamInfo_); + } + 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, uid_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(2, getUserNameBytes()); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, force_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(4, getGuildNameBytes()); + } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(5, score_); + } + if (((bitField0_ & 0x00000020) == 0x00000020)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(6, hadChallenge_); + } + if (((bitField0_ & 0x00000040) == 0x00000040)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(7, rank_); + } + if (((bitField0_ & 0x00000080) == 0x00000080)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(8, teamInfo_); + } + 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.Family.CarChallengeItem parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.Family.CarChallengeItem 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.Family.CarChallengeItem parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.Family.CarChallengeItem parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.Family.CarChallengeItem parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.Family.CarChallengeItem 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.Family.CarChallengeItem parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static com.ljsd.jieling.protocols.Family.CarChallengeItem 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.Family.CarChallengeItem parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.Family.CarChallengeItem 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.Family.CarChallengeItem 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.CarChallengeItem} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements com.ljsd.jieling.protocols.Family.CarChallengeItemOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.Family.internal_static_com_ljsd_jieling_protocols_CarChallengeItem_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.Family.internal_static_com_ljsd_jieling_protocols_CarChallengeItem_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.Family.CarChallengeItem.class, com.ljsd.jieling.protocols.Family.CarChallengeItem.Builder.class); + } + + // Construct using com.ljsd.jieling.protocols.Family.CarChallengeItem.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getTeamInfoFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + uid_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + userName_ = ""; + bitField0_ = (bitField0_ & ~0x00000002); + force_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); + guildName_ = ""; + bitField0_ = (bitField0_ & ~0x00000008); + score_ = 0; + bitField0_ = (bitField0_ & ~0x00000010); + hadChallenge_ = 0; + bitField0_ = (bitField0_ & ~0x00000020); + rank_ = 0; + bitField0_ = (bitField0_ & ~0x00000040); + if (teamInfoBuilder_ == null) { + teamInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance(); + } else { + teamInfoBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000080); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.ljsd.jieling.protocols.Family.internal_static_com_ljsd_jieling_protocols_CarChallengeItem_descriptor; + } + + public com.ljsd.jieling.protocols.Family.CarChallengeItem getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.Family.CarChallengeItem.getDefaultInstance(); + } + + public com.ljsd.jieling.protocols.Family.CarChallengeItem build() { + com.ljsd.jieling.protocols.Family.CarChallengeItem result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.ljsd.jieling.protocols.Family.CarChallengeItem buildPartial() { + com.ljsd.jieling.protocols.Family.CarChallengeItem result = new com.ljsd.jieling.protocols.Family.CarChallengeItem(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.uid_ = uid_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.userName_ = userName_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.force_ = force_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + result.guildName_ = guildName_; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { + to_bitField0_ |= 0x00000010; + } + result.score_ = score_; + if (((from_bitField0_ & 0x00000020) == 0x00000020)) { + to_bitField0_ |= 0x00000020; + } + result.hadChallenge_ = hadChallenge_; + if (((from_bitField0_ & 0x00000040) == 0x00000040)) { + to_bitField0_ |= 0x00000040; + } + result.rank_ = rank_; + if (((from_bitField0_ & 0x00000080) == 0x00000080)) { + to_bitField0_ |= 0x00000080; + } + if (teamInfoBuilder_ == null) { + result.teamInfo_ = teamInfo_; + } else { + result.teamInfo_ = teamInfoBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.ljsd.jieling.protocols.Family.CarChallengeItem) { + return mergeFrom((com.ljsd.jieling.protocols.Family.CarChallengeItem)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.ljsd.jieling.protocols.Family.CarChallengeItem other) { + if (other == com.ljsd.jieling.protocols.Family.CarChallengeItem.getDefaultInstance()) return this; + if (other.hasUid()) { + setUid(other.getUid()); + } + if (other.hasUserName()) { + bitField0_ |= 0x00000002; + userName_ = other.userName_; + onChanged(); + } + if (other.hasForce()) { + setForce(other.getForce()); + } + if (other.hasGuildName()) { + bitField0_ |= 0x00000008; + guildName_ = other.guildName_; + onChanged(); + } + if (other.hasScore()) { + setScore(other.getScore()); + } + if (other.hasHadChallenge()) { + setHadChallenge(other.getHadChallenge()); + } + if (other.hasRank()) { + setRank(other.getRank()); + } + if (other.hasTeamInfo()) { + mergeTeamInfo(other.getTeamInfo()); + } + 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.Family.CarChallengeItem parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.ljsd.jieling.protocols.Family.CarChallengeItem) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional int32 uid = 1; + private int uid_ ; + /** + * optional int32 uid = 1; + */ + public boolean hasUid() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 uid = 1; + */ + public int getUid() { + return uid_; + } + /** + * optional int32 uid = 1; + */ + public Builder setUid(int value) { + bitField0_ |= 0x00000001; + uid_ = value; + onChanged(); + return this; + } + /** + * optional int32 uid = 1; + */ + public Builder clearUid() { + bitField0_ = (bitField0_ & ~0x00000001); + uid_ = 0; + onChanged(); + return this; + } + + // optional string userName = 2; + private java.lang.Object userName_ = ""; + /** + * optional string userName = 2; + */ + public boolean hasUserName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional string userName = 2; + */ + public java.lang.String getUserName() { + java.lang.Object ref = userName_; + if (!(ref instanceof java.lang.String)) { + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + userName_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string userName = 2; + */ + public com.google.protobuf.ByteString + getUserNameBytes() { + java.lang.Object ref = userName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + userName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string userName = 2; + */ + public Builder setUserName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + userName_ = value; + onChanged(); + return this; + } + /** + * optional string userName = 2; + */ + public Builder clearUserName() { + bitField0_ = (bitField0_ & ~0x00000002); + userName_ = getDefaultInstance().getUserName(); + onChanged(); + return this; + } + /** + * optional string userName = 2; + */ + public Builder setUserNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + userName_ = value; + onChanged(); + return this; + } + + // optional int32 force = 3; + private int force_ ; + /** + * optional int32 force = 3; + */ + public boolean hasForce() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 force = 3; + */ + public int getForce() { + return force_; + } + /** + * optional int32 force = 3; + */ + public Builder setForce(int value) { + bitField0_ |= 0x00000004; + force_ = value; + onChanged(); + return this; + } + /** + * optional int32 force = 3; + */ + public Builder clearForce() { + bitField0_ = (bitField0_ & ~0x00000004); + force_ = 0; + onChanged(); + return this; + } + + // optional string guildName = 4; + private java.lang.Object guildName_ = ""; + /** + * optional string guildName = 4; + */ + public boolean hasGuildName() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional string guildName = 4; + */ + public java.lang.String getGuildName() { + java.lang.Object ref = guildName_; + if (!(ref instanceof java.lang.String)) { + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + guildName_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string guildName = 4; + */ + public com.google.protobuf.ByteString + getGuildNameBytes() { + java.lang.Object ref = guildName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + guildName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string guildName = 4; + */ + public Builder setGuildName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000008; + guildName_ = value; + onChanged(); + return this; + } + /** + * optional string guildName = 4; + */ + public Builder clearGuildName() { + bitField0_ = (bitField0_ & ~0x00000008); + guildName_ = getDefaultInstance().getGuildName(); + onChanged(); + return this; + } + /** + * optional string guildName = 4; + */ + public Builder setGuildNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000008; + guildName_ = value; + onChanged(); + return this; + } + + // optional int32 score = 5; + private int score_ ; + /** + * optional int32 score = 5; + */ + public boolean hasScore() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional int32 score = 5; + */ + public int getScore() { + return score_; + } + /** + * optional int32 score = 5; + */ + public Builder setScore(int value) { + bitField0_ |= 0x00000010; + score_ = value; + onChanged(); + return this; + } + /** + * optional int32 score = 5; + */ + public Builder clearScore() { + bitField0_ = (bitField0_ & ~0x00000010); + score_ = 0; + onChanged(); + return this; + } + + // optional int32 hadChallenge = 6; + private int hadChallenge_ ; + /** + * optional int32 hadChallenge = 6; + * + *
+       * 是否已挑战过,1:表示挑战过,2:未挑战过。
+       * 
+ */ + public boolean hasHadChallenge() { + return ((bitField0_ & 0x00000020) == 0x00000020); + } + /** + * optional int32 hadChallenge = 6; + * + *
+       * 是否已挑战过,1:表示挑战过,2:未挑战过。
+       * 
+ */ + public int getHadChallenge() { + return hadChallenge_; + } + /** + * optional int32 hadChallenge = 6; + * + *
+       * 是否已挑战过,1:表示挑战过,2:未挑战过。
+       * 
+ */ + public Builder setHadChallenge(int value) { + bitField0_ |= 0x00000020; + hadChallenge_ = value; + onChanged(); + return this; + } + /** + * optional int32 hadChallenge = 6; + * + *
+       * 是否已挑战过,1:表示挑战过,2:未挑战过。
+       * 
+ */ + public Builder clearHadChallenge() { + bitField0_ = (bitField0_ & ~0x00000020); + hadChallenge_ = 0; + onChanged(); + return this; + } + + // optional int32 rank = 7; + private int rank_ ; + /** + * optional int32 rank = 7; + */ + public boolean hasRank() { + return ((bitField0_ & 0x00000040) == 0x00000040); + } + /** + * optional int32 rank = 7; + */ + public int getRank() { + return rank_; + } + /** + * optional int32 rank = 7; + */ + public Builder setRank(int value) { + bitField0_ |= 0x00000040; + rank_ = value; + onChanged(); + return this; + } + /** + * optional int32 rank = 7; + */ + public Builder clearRank() { + bitField0_ = (bitField0_ & ~0x00000040); + rank_ = 0; + onChanged(); + return this; + } + + // optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + private com.ljsd.jieling.protocols.CommonProto.TeamOneInfo teamInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.TeamOneInfo, com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder, com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder> teamInfoBuilder_; + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + public boolean hasTeamInfo() { + return ((bitField0_ & 0x00000080) == 0x00000080); + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getTeamInfo() { + if (teamInfoBuilder_ == null) { + return teamInfo_; + } else { + return teamInfoBuilder_.getMessage(); + } + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + public Builder setTeamInfo(com.ljsd.jieling.protocols.CommonProto.TeamOneInfo value) { + if (teamInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + teamInfo_ = value; + onChanged(); + } else { + teamInfoBuilder_.setMessage(value); + } + bitField0_ |= 0x00000080; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + public Builder setTeamInfo( + com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder builderForValue) { + if (teamInfoBuilder_ == null) { + teamInfo_ = builderForValue.build(); + onChanged(); + } else { + teamInfoBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000080; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + public Builder mergeTeamInfo(com.ljsd.jieling.protocols.CommonProto.TeamOneInfo value) { + if (teamInfoBuilder_ == null) { + if (((bitField0_ & 0x00000080) == 0x00000080) && + teamInfo_ != com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance()) { + teamInfo_ = + com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.newBuilder(teamInfo_).mergeFrom(value).buildPartial(); + } else { + teamInfo_ = value; + } + onChanged(); + } else { + teamInfoBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000080; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + public Builder clearTeamInfo() { + if (teamInfoBuilder_ == null) { + teamInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance(); + onChanged(); + } else { + teamInfoBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000080); + return this; + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder getTeamInfoBuilder() { + bitField0_ |= 0x00000080; + onChanged(); + return getTeamInfoFieldBuilder().getBuilder(); + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getTeamInfoOrBuilder() { + if (teamInfoBuilder_ != null) { + return teamInfoBuilder_.getMessageOrBuilder(); + } else { + return teamInfo_; + } + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo teamInfo = 8; + */ + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.TeamOneInfo, com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder, com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder> + getTeamInfoFieldBuilder() { + if (teamInfoBuilder_ == null) { + teamInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.TeamOneInfo, com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder, com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder>( + teamInfo_, + getParentForChildren(), + isClean()); + teamInfo_ = null; + } + return teamInfoBuilder_; + } + + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.CarChallengeItem) + } + + static { + defaultInstance = new CarChallengeItem(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.CarChallengeItem) + } + public interface GetCarChallenegListResponseOrBuilder extends com.google.protobuf.MessageOrBuilder { - // repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + // repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - java.util.List - getRankInfoList(); + java.util.List + getCarChallengeItemList(); /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - com.ljsd.jieling.protocols.CommonProto.RankInfo getRankInfo(int index); + com.ljsd.jieling.protocols.Family.CarChallengeItem getCarChallengeItem(int index); /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - int getRankInfoCount(); + int getCarChallengeItemCount(); /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - java.util.List - getRankInfoOrBuilderList(); + java.util.List + getCarChallengeItemOrBuilderList(); /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - com.ljsd.jieling.protocols.CommonProto.RankInfoOrBuilder getRankInfoOrBuilder( + com.ljsd.jieling.protocols.Family.CarChallengeItemOrBuilder getCarChallengeItemOrBuilder( int index); // optional int32 myRank = 2; @@ -44836,10 +46092,10 @@ public final class Family { } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - rankInfo_ = new java.util.ArrayList(); + carChallengeItem_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - rankInfo_.add(input.readMessage(com.ljsd.jieling.protocols.CommonProto.RankInfo.PARSER, extensionRegistry)); + carChallengeItem_.add(input.readMessage(com.ljsd.jieling.protocols.Family.CarChallengeItem.PARSER, extensionRegistry)); break; } case 16: { @@ -44861,7 +46117,7 @@ public final class Family { e.getMessage()).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - rankInfo_ = java.util.Collections.unmodifiableList(rankInfo_); + carChallengeItem_ = java.util.Collections.unmodifiableList(carChallengeItem_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -44895,40 +46151,40 @@ public final class Family { } private int bitField0_; - // repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; - public static final int RANKINFO_FIELD_NUMBER = 1; - private java.util.List rankInfo_; + // repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; + public static final int CARCHALLENGEITEM_FIELD_NUMBER = 1; + private java.util.List carChallengeItem_; /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public java.util.List getRankInfoList() { - return rankInfo_; + public java.util.List getCarChallengeItemList() { + return carChallengeItem_; } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public java.util.List - getRankInfoOrBuilderList() { - return rankInfo_; + public java.util.List + getCarChallengeItemOrBuilderList() { + return carChallengeItem_; } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public int getRankInfoCount() { - return rankInfo_.size(); + public int getCarChallengeItemCount() { + return carChallengeItem_.size(); } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public com.ljsd.jieling.protocols.CommonProto.RankInfo getRankInfo(int index) { - return rankInfo_.get(index); + public com.ljsd.jieling.protocols.Family.CarChallengeItem getCarChallengeItem(int index) { + return carChallengeItem_.get(index); } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public com.ljsd.jieling.protocols.CommonProto.RankInfoOrBuilder getRankInfoOrBuilder( + public com.ljsd.jieling.protocols.Family.CarChallengeItemOrBuilder getCarChallengeItemOrBuilder( int index) { - return rankInfo_.get(index); + return carChallengeItem_.get(index); } // optional int32 myRank = 2; @@ -44980,7 +46236,7 @@ public final class Family { } private void initFields() { - rankInfo_ = java.util.Collections.emptyList(); + carChallengeItem_ = java.util.Collections.emptyList(); myRank_ = 0; myScore_ = 0; } @@ -44996,8 +46252,8 @@ public final class Family { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - for (int i = 0; i < rankInfo_.size(); i++) { - output.writeMessage(1, rankInfo_.get(i)); + for (int i = 0; i < carChallengeItem_.size(); i++) { + output.writeMessage(1, carChallengeItem_.get(i)); } if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeInt32(2, myRank_); @@ -45014,9 +46270,9 @@ public final class Family { if (size != -1) return size; size = 0; - for (int i = 0; i < rankInfo_.size(); i++) { + for (int i = 0; i < carChallengeItem_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, rankInfo_.get(i)); + .computeMessageSize(1, carChallengeItem_.get(i)); } if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -45134,7 +46390,7 @@ public final class Family { } private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getRankInfoFieldBuilder(); + getCarChallengeItemFieldBuilder(); } } private static Builder create() { @@ -45143,11 +46399,11 @@ public final class Family { public Builder clear() { super.clear(); - if (rankInfoBuilder_ == null) { - rankInfo_ = java.util.Collections.emptyList(); + if (carChallengeItemBuilder_ == null) { + carChallengeItem_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); } else { - rankInfoBuilder_.clear(); + carChallengeItemBuilder_.clear(); } myRank_ = 0; bitField0_ = (bitField0_ & ~0x00000002); @@ -45181,14 +46437,14 @@ public final class Family { com.ljsd.jieling.protocols.Family.GetCarChallenegListResponse result = new com.ljsd.jieling.protocols.Family.GetCarChallenegListResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; - if (rankInfoBuilder_ == null) { + if (carChallengeItemBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { - rankInfo_ = java.util.Collections.unmodifiableList(rankInfo_); + carChallengeItem_ = java.util.Collections.unmodifiableList(carChallengeItem_); bitField0_ = (bitField0_ & ~0x00000001); } - result.rankInfo_ = rankInfo_; + result.carChallengeItem_ = carChallengeItem_; } else { - result.rankInfo_ = rankInfoBuilder_.build(); + result.carChallengeItem_ = carChallengeItemBuilder_.build(); } if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000001; @@ -45214,29 +46470,29 @@ public final class Family { public Builder mergeFrom(com.ljsd.jieling.protocols.Family.GetCarChallenegListResponse other) { if (other == com.ljsd.jieling.protocols.Family.GetCarChallenegListResponse.getDefaultInstance()) return this; - if (rankInfoBuilder_ == null) { - if (!other.rankInfo_.isEmpty()) { - if (rankInfo_.isEmpty()) { - rankInfo_ = other.rankInfo_; + if (carChallengeItemBuilder_ == null) { + if (!other.carChallengeItem_.isEmpty()) { + if (carChallengeItem_.isEmpty()) { + carChallengeItem_ = other.carChallengeItem_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureRankInfoIsMutable(); - rankInfo_.addAll(other.rankInfo_); + ensureCarChallengeItemIsMutable(); + carChallengeItem_.addAll(other.carChallengeItem_); } onChanged(); } } else { - if (!other.rankInfo_.isEmpty()) { - if (rankInfoBuilder_.isEmpty()) { - rankInfoBuilder_.dispose(); - rankInfoBuilder_ = null; - rankInfo_ = other.rankInfo_; + if (!other.carChallengeItem_.isEmpty()) { + if (carChallengeItemBuilder_.isEmpty()) { + carChallengeItemBuilder_.dispose(); + carChallengeItemBuilder_ = null; + carChallengeItem_ = other.carChallengeItem_; bitField0_ = (bitField0_ & ~0x00000001); - rankInfoBuilder_ = + carChallengeItemBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getRankInfoFieldBuilder() : null; + getCarChallengeItemFieldBuilder() : null; } else { - rankInfoBuilder_.addAllMessages(other.rankInfo_); + carChallengeItemBuilder_.addAllMessages(other.carChallengeItem_); } } } @@ -45273,244 +46529,244 @@ public final class Family { } private int bitField0_; - // repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; - private java.util.List rankInfo_ = + // repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; + private java.util.List carChallengeItem_ = java.util.Collections.emptyList(); - private void ensureRankInfoIsMutable() { + private void ensureCarChallengeItemIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - rankInfo_ = new java.util.ArrayList(rankInfo_); + carChallengeItem_ = new java.util.ArrayList(carChallengeItem_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - com.ljsd.jieling.protocols.CommonProto.RankInfo, com.ljsd.jieling.protocols.CommonProto.RankInfo.Builder, com.ljsd.jieling.protocols.CommonProto.RankInfoOrBuilder> rankInfoBuilder_; + com.ljsd.jieling.protocols.Family.CarChallengeItem, com.ljsd.jieling.protocols.Family.CarChallengeItem.Builder, com.ljsd.jieling.protocols.Family.CarChallengeItemOrBuilder> carChallengeItemBuilder_; /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public java.util.List getRankInfoList() { - if (rankInfoBuilder_ == null) { - return java.util.Collections.unmodifiableList(rankInfo_); + public java.util.List getCarChallengeItemList() { + if (carChallengeItemBuilder_ == null) { + return java.util.Collections.unmodifiableList(carChallengeItem_); } else { - return rankInfoBuilder_.getMessageList(); + return carChallengeItemBuilder_.getMessageList(); } } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public int getRankInfoCount() { - if (rankInfoBuilder_ == null) { - return rankInfo_.size(); + public int getCarChallengeItemCount() { + if (carChallengeItemBuilder_ == null) { + return carChallengeItem_.size(); } else { - return rankInfoBuilder_.getCount(); + return carChallengeItemBuilder_.getCount(); } } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public com.ljsd.jieling.protocols.CommonProto.RankInfo getRankInfo(int index) { - if (rankInfoBuilder_ == null) { - return rankInfo_.get(index); + public com.ljsd.jieling.protocols.Family.CarChallengeItem getCarChallengeItem(int index) { + if (carChallengeItemBuilder_ == null) { + return carChallengeItem_.get(index); } else { - return rankInfoBuilder_.getMessage(index); + return carChallengeItemBuilder_.getMessage(index); } } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public Builder setRankInfo( - int index, com.ljsd.jieling.protocols.CommonProto.RankInfo value) { - if (rankInfoBuilder_ == null) { + public Builder setCarChallengeItem( + int index, com.ljsd.jieling.protocols.Family.CarChallengeItem value) { + if (carChallengeItemBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureRankInfoIsMutable(); - rankInfo_.set(index, value); + ensureCarChallengeItemIsMutable(); + carChallengeItem_.set(index, value); onChanged(); } else { - rankInfoBuilder_.setMessage(index, value); + carChallengeItemBuilder_.setMessage(index, value); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public Builder setRankInfo( - int index, com.ljsd.jieling.protocols.CommonProto.RankInfo.Builder builderForValue) { - if (rankInfoBuilder_ == null) { - ensureRankInfoIsMutable(); - rankInfo_.set(index, builderForValue.build()); + public Builder setCarChallengeItem( + int index, com.ljsd.jieling.protocols.Family.CarChallengeItem.Builder builderForValue) { + if (carChallengeItemBuilder_ == null) { + ensureCarChallengeItemIsMutable(); + carChallengeItem_.set(index, builderForValue.build()); onChanged(); } else { - rankInfoBuilder_.setMessage(index, builderForValue.build()); + carChallengeItemBuilder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public Builder addRankInfo(com.ljsd.jieling.protocols.CommonProto.RankInfo value) { - if (rankInfoBuilder_ == null) { + public Builder addCarChallengeItem(com.ljsd.jieling.protocols.Family.CarChallengeItem value) { + if (carChallengeItemBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureRankInfoIsMutable(); - rankInfo_.add(value); + ensureCarChallengeItemIsMutable(); + carChallengeItem_.add(value); onChanged(); } else { - rankInfoBuilder_.addMessage(value); + carChallengeItemBuilder_.addMessage(value); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public Builder addRankInfo( - int index, com.ljsd.jieling.protocols.CommonProto.RankInfo value) { - if (rankInfoBuilder_ == null) { + public Builder addCarChallengeItem( + int index, com.ljsd.jieling.protocols.Family.CarChallengeItem value) { + if (carChallengeItemBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureRankInfoIsMutable(); - rankInfo_.add(index, value); + ensureCarChallengeItemIsMutable(); + carChallengeItem_.add(index, value); onChanged(); } else { - rankInfoBuilder_.addMessage(index, value); + carChallengeItemBuilder_.addMessage(index, value); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public Builder addRankInfo( - com.ljsd.jieling.protocols.CommonProto.RankInfo.Builder builderForValue) { - if (rankInfoBuilder_ == null) { - ensureRankInfoIsMutable(); - rankInfo_.add(builderForValue.build()); + public Builder addCarChallengeItem( + com.ljsd.jieling.protocols.Family.CarChallengeItem.Builder builderForValue) { + if (carChallengeItemBuilder_ == null) { + ensureCarChallengeItemIsMutable(); + carChallengeItem_.add(builderForValue.build()); onChanged(); } else { - rankInfoBuilder_.addMessage(builderForValue.build()); + carChallengeItemBuilder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public Builder addRankInfo( - int index, com.ljsd.jieling.protocols.CommonProto.RankInfo.Builder builderForValue) { - if (rankInfoBuilder_ == null) { - ensureRankInfoIsMutable(); - rankInfo_.add(index, builderForValue.build()); + public Builder addCarChallengeItem( + int index, com.ljsd.jieling.protocols.Family.CarChallengeItem.Builder builderForValue) { + if (carChallengeItemBuilder_ == null) { + ensureCarChallengeItemIsMutable(); + carChallengeItem_.add(index, builderForValue.build()); onChanged(); } else { - rankInfoBuilder_.addMessage(index, builderForValue.build()); + carChallengeItemBuilder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public Builder addAllRankInfo( - java.lang.Iterable values) { - if (rankInfoBuilder_ == null) { - ensureRankInfoIsMutable(); - super.addAll(values, rankInfo_); + public Builder addAllCarChallengeItem( + java.lang.Iterable values) { + if (carChallengeItemBuilder_ == null) { + ensureCarChallengeItemIsMutable(); + super.addAll(values, carChallengeItem_); onChanged(); } else { - rankInfoBuilder_.addAllMessages(values); + carChallengeItemBuilder_.addAllMessages(values); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public Builder clearRankInfo() { - if (rankInfoBuilder_ == null) { - rankInfo_ = java.util.Collections.emptyList(); + public Builder clearCarChallengeItem() { + if (carChallengeItemBuilder_ == null) { + carChallengeItem_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - rankInfoBuilder_.clear(); + carChallengeItemBuilder_.clear(); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public Builder removeRankInfo(int index) { - if (rankInfoBuilder_ == null) { - ensureRankInfoIsMutable(); - rankInfo_.remove(index); + public Builder removeCarChallengeItem(int index) { + if (carChallengeItemBuilder_ == null) { + ensureCarChallengeItemIsMutable(); + carChallengeItem_.remove(index); onChanged(); } else { - rankInfoBuilder_.remove(index); + carChallengeItemBuilder_.remove(index); } return this; } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public com.ljsd.jieling.protocols.CommonProto.RankInfo.Builder getRankInfoBuilder( + public com.ljsd.jieling.protocols.Family.CarChallengeItem.Builder getCarChallengeItemBuilder( int index) { - return getRankInfoFieldBuilder().getBuilder(index); + return getCarChallengeItemFieldBuilder().getBuilder(index); } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public com.ljsd.jieling.protocols.CommonProto.RankInfoOrBuilder getRankInfoOrBuilder( + public com.ljsd.jieling.protocols.Family.CarChallengeItemOrBuilder getCarChallengeItemOrBuilder( int index) { - if (rankInfoBuilder_ == null) { - return rankInfo_.get(index); } else { - return rankInfoBuilder_.getMessageOrBuilder(index); + if (carChallengeItemBuilder_ == null) { + return carChallengeItem_.get(index); } else { + return carChallengeItemBuilder_.getMessageOrBuilder(index); } } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public java.util.List - getRankInfoOrBuilderList() { - if (rankInfoBuilder_ != null) { - return rankInfoBuilder_.getMessageOrBuilderList(); + public java.util.List + getCarChallengeItemOrBuilderList() { + if (carChallengeItemBuilder_ != null) { + return carChallengeItemBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(rankInfo_); + return java.util.Collections.unmodifiableList(carChallengeItem_); } } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public com.ljsd.jieling.protocols.CommonProto.RankInfo.Builder addRankInfoBuilder() { - return getRankInfoFieldBuilder().addBuilder( - com.ljsd.jieling.protocols.CommonProto.RankInfo.getDefaultInstance()); + public com.ljsd.jieling.protocols.Family.CarChallengeItem.Builder addCarChallengeItemBuilder() { + return getCarChallengeItemFieldBuilder().addBuilder( + com.ljsd.jieling.protocols.Family.CarChallengeItem.getDefaultInstance()); } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public com.ljsd.jieling.protocols.CommonProto.RankInfo.Builder addRankInfoBuilder( + public com.ljsd.jieling.protocols.Family.CarChallengeItem.Builder addCarChallengeItemBuilder( int index) { - return getRankInfoFieldBuilder().addBuilder( - index, com.ljsd.jieling.protocols.CommonProto.RankInfo.getDefaultInstance()); + return getCarChallengeItemFieldBuilder().addBuilder( + index, com.ljsd.jieling.protocols.Family.CarChallengeItem.getDefaultInstance()); } /** - * repeated .com.ljsd.jieling.protocols.RankInfo rankInfo = 1; + * repeated .com.ljsd.jieling.protocols.CarChallengeItem carChallengeItem = 1; */ - public java.util.List - getRankInfoBuilderList() { - return getRankInfoFieldBuilder().getBuilderList(); + public java.util.List + getCarChallengeItemBuilderList() { + return getCarChallengeItemFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.ljsd.jieling.protocols.CommonProto.RankInfo, com.ljsd.jieling.protocols.CommonProto.RankInfo.Builder, com.ljsd.jieling.protocols.CommonProto.RankInfoOrBuilder> - getRankInfoFieldBuilder() { - if (rankInfoBuilder_ == null) { - rankInfoBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.ljsd.jieling.protocols.CommonProto.RankInfo, com.ljsd.jieling.protocols.CommonProto.RankInfo.Builder, com.ljsd.jieling.protocols.CommonProto.RankInfoOrBuilder>( - rankInfo_, + com.ljsd.jieling.protocols.Family.CarChallengeItem, com.ljsd.jieling.protocols.Family.CarChallengeItem.Builder, com.ljsd.jieling.protocols.Family.CarChallengeItemOrBuilder> + getCarChallengeItemFieldBuilder() { + if (carChallengeItemBuilder_ == null) { + carChallengeItemBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + com.ljsd.jieling.protocols.Family.CarChallengeItem, com.ljsd.jieling.protocols.Family.CarChallengeItem.Builder, com.ljsd.jieling.protocols.Family.CarChallengeItemOrBuilder>( + carChallengeItem_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), isClean()); - rankInfo_ = null; + carChallengeItem_ = null; } - return rankInfoBuilder_; + return carChallengeItemBuilder_; } // optional int32 myRank = 2; @@ -50952,6 +52208,11 @@ public final class Family { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_com_ljsd_jieling_protocols_ResetGuildSkillResponse_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_com_ljsd_jieling_protocols_CarChallengeItem_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_com_ljsd_jieling_protocols_CarChallengeItem_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor internal_static_com_ljsd_jieling_protocols_GetCarChallenegListResponse_descriptor; private static @@ -51162,26 +52423,31 @@ public final class Family { "ldSkillLevelUpRequest\022\014\n\004type\030\001 \001(\005\"&\n\026R" + "esetGuildSkillRequest\022\014\n\004type\030\001 \001(\005\"I\n\027R" + "esetGuildSkillResponse\022.\n\004drop\030\001 \001(\0132 .c" + - "om.ljsd.jieling.protocols.Drop\"v\n\033GetCar" + - "ChallenegListResponse\0226\n\010rankInfo\030\001 \003(\0132" + - "$.com.ljsd.jieling.protocols.RankInfo\022\016\n" + - "\006myRank\030\002 \001(\005\022\017\n\007myScore\030\003 \001(\005\"!\n\021Family", - "FeteRequest\022\014\n\004type\030\001 \001(\005\"$\n\022FamilyFeteR" + - "esponse\022\016\n\006curExp\030\001 \001(\005\"(\n\032FamilyGetFete" + - "RewardRequest\022\n\n\002id\030\001 \001(\005\"\035\n\033FamilyGetFe" + - "teRewardResponse\"2\n!FamilyFeteRewardProc" + - "essIndication\022\r\n\005score\030\001 \001(\005\"0\n\rDeathPat" + - "hInfo\022\016\n\006pathId\030\001 \001(\005\022\017\n\007guildId\030\002 \001(\005\"," + - "\n\032GetDeathPathStatusResponse\022\016\n\006status\030\001" + - " \001(\005\"~\n\030GetDeathPathInfoResponse\022\020\n\010over" + - "Time\030\001 \001(\005\022\026\n\016challengeCount\030\002 \001(\005\0228\n\005in" + - "fos\030\003 \003(\0132).com.ljsd.jieling.protocols.D", - "eathPathInfo\"+\n\031ChallengeDeathPathReques" + - "t\022\016\n\006pathId\030\001 \001(\005\"\226\001\n\032ChallengeDeathPath" + - "Response\0228\n\tfightData\030\001 \001(\0132%.com.ljsd.j" + - "ieling.protocols.FightData\022\016\n\006damage\030\002 \001" + - "(\005\022.\n\004drop\030\003 \001(\0132 .com.ljsd.jieling.prot" + - "ocols.DropB\002H\001" + "om.ljsd.jieling.protocols.Drop\"\301\001\n\020CarCh" + + "allengeItem\022\013\n\003uid\030\001 \001(\005\022\020\n\010userName\030\002 \001" + + "(\t\022\r\n\005force\030\003 \001(\005\022\021\n\tguildName\030\004 \001(\t\022\r\n\005" + + "score\030\005 \001(\005\022\024\n\014hadChallenge\030\006 \001(\005\022\014\n\004ran", + "k\030\007 \001(\005\0229\n\010teamInfo\030\010 \001(\0132\'.com.ljsd.jie" + + "ling.protocols.TeamOneInfo\"\206\001\n\033GetCarCha" + + "llenegListResponse\022F\n\020carChallengeItem\030\001" + + " \003(\0132,.com.ljsd.jieling.protocols.CarCha" + + "llengeItem\022\016\n\006myRank\030\002 \001(\005\022\017\n\007myScore\030\003 " + + "\001(\005\"!\n\021FamilyFeteRequest\022\014\n\004type\030\001 \001(\005\"$" + + "\n\022FamilyFeteResponse\022\016\n\006curExp\030\001 \001(\005\"(\n\032" + + "FamilyGetFeteRewardRequest\022\n\n\002id\030\001 \001(\005\"\035" + + "\n\033FamilyGetFeteRewardResponse\"2\n!FamilyF" + + "eteRewardProcessIndication\022\r\n\005score\030\001 \001(", + "\005\"0\n\rDeathPathInfo\022\016\n\006pathId\030\001 \001(\005\022\017\n\007gu" + + "ildId\030\002 \001(\005\",\n\032GetDeathPathStatusRespons" + + "e\022\016\n\006status\030\001 \001(\005\"~\n\030GetDeathPathInfoRes" + + "ponse\022\020\n\010overTime\030\001 \001(\005\022\026\n\016challengeCoun" + + "t\030\002 \001(\005\0228\n\005infos\030\003 \003(\0132).com.ljsd.jielin" + + "g.protocols.DeathPathInfo\"+\n\031ChallengeDe" + + "athPathRequest\022\016\n\006pathId\030\001 \001(\005\"\226\001\n\032Chall" + + "engeDeathPathResponse\0228\n\tfightData\030\001 \001(\013" + + "2%.com.ljsd.jieling.protocols.FightData\022" + + "\016\n\006damage\030\002 \001(\005\022.\n\004drop\030\003 \001(\0132 .com.ljsd", + ".jieling.protocols.DropB\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -51578,68 +52844,74 @@ public final class Family { com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_ResetGuildSkillResponse_descriptor, new java.lang.String[] { "Drop", }); - internal_static_com_ljsd_jieling_protocols_GetCarChallenegListResponse_descriptor = + internal_static_com_ljsd_jieling_protocols_CarChallengeItem_descriptor = getDescriptor().getMessageTypes().get(65); + internal_static_com_ljsd_jieling_protocols_CarChallengeItem_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_com_ljsd_jieling_protocols_CarChallengeItem_descriptor, + new java.lang.String[] { "Uid", "UserName", "Force", "GuildName", "Score", "HadChallenge", "Rank", "TeamInfo", }); + internal_static_com_ljsd_jieling_protocols_GetCarChallenegListResponse_descriptor = + getDescriptor().getMessageTypes().get(66); internal_static_com_ljsd_jieling_protocols_GetCarChallenegListResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_GetCarChallenegListResponse_descriptor, - new java.lang.String[] { "RankInfo", "MyRank", "MyScore", }); + new java.lang.String[] { "CarChallengeItem", "MyRank", "MyScore", }); internal_static_com_ljsd_jieling_protocols_FamilyFeteRequest_descriptor = - getDescriptor().getMessageTypes().get(66); + getDescriptor().getMessageTypes().get(67); internal_static_com_ljsd_jieling_protocols_FamilyFeteRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_FamilyFeteRequest_descriptor, new java.lang.String[] { "Type", }); internal_static_com_ljsd_jieling_protocols_FamilyFeteResponse_descriptor = - getDescriptor().getMessageTypes().get(67); + getDescriptor().getMessageTypes().get(68); internal_static_com_ljsd_jieling_protocols_FamilyFeteResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_FamilyFeteResponse_descriptor, new java.lang.String[] { "CurExp", }); internal_static_com_ljsd_jieling_protocols_FamilyGetFeteRewardRequest_descriptor = - getDescriptor().getMessageTypes().get(68); + getDescriptor().getMessageTypes().get(69); internal_static_com_ljsd_jieling_protocols_FamilyGetFeteRewardRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_FamilyGetFeteRewardRequest_descriptor, new java.lang.String[] { "Id", }); internal_static_com_ljsd_jieling_protocols_FamilyGetFeteRewardResponse_descriptor = - getDescriptor().getMessageTypes().get(69); + getDescriptor().getMessageTypes().get(70); internal_static_com_ljsd_jieling_protocols_FamilyGetFeteRewardResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_FamilyGetFeteRewardResponse_descriptor, new java.lang.String[] { }); internal_static_com_ljsd_jieling_protocols_FamilyFeteRewardProcessIndication_descriptor = - getDescriptor().getMessageTypes().get(70); + getDescriptor().getMessageTypes().get(71); internal_static_com_ljsd_jieling_protocols_FamilyFeteRewardProcessIndication_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_FamilyFeteRewardProcessIndication_descriptor, new java.lang.String[] { "Score", }); internal_static_com_ljsd_jieling_protocols_DeathPathInfo_descriptor = - getDescriptor().getMessageTypes().get(71); + getDescriptor().getMessageTypes().get(72); internal_static_com_ljsd_jieling_protocols_DeathPathInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_DeathPathInfo_descriptor, new java.lang.String[] { "PathId", "GuildId", }); internal_static_com_ljsd_jieling_protocols_GetDeathPathStatusResponse_descriptor = - getDescriptor().getMessageTypes().get(72); + getDescriptor().getMessageTypes().get(73); internal_static_com_ljsd_jieling_protocols_GetDeathPathStatusResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_GetDeathPathStatusResponse_descriptor, new java.lang.String[] { "Status", }); internal_static_com_ljsd_jieling_protocols_GetDeathPathInfoResponse_descriptor = - getDescriptor().getMessageTypes().get(73); + getDescriptor().getMessageTypes().get(74); internal_static_com_ljsd_jieling_protocols_GetDeathPathInfoResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_GetDeathPathInfoResponse_descriptor, new java.lang.String[] { "OverTime", "ChallengeCount", "Infos", }); internal_static_com_ljsd_jieling_protocols_ChallengeDeathPathRequest_descriptor = - getDescriptor().getMessageTypes().get(74); + getDescriptor().getMessageTypes().get(75); internal_static_com_ljsd_jieling_protocols_ChallengeDeathPathRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_ChallengeDeathPathRequest_descriptor, new java.lang.String[] { "PathId", }); internal_static_com_ljsd_jieling_protocols_ChallengeDeathPathResponse_descriptor = - getDescriptor().getMessageTypes().get(75); + getDescriptor().getMessageTypes().get(76); internal_static_com_ljsd_jieling_protocols_ChallengeDeathPathResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_ChallengeDeathPathResponse_descriptor, 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 843f62b02..f8ceb0690 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 @@ -241,6 +241,8 @@ public class RedisKey { public final static String ACTIVITY_GIFT_LIMIT = "ACTIVITY_GIFT_LIMIT"; //活动礼包个数限制 + public final static String CAR_CHALLENEG_SB = "CAR_CHALLENEG_SB"; //车迟玩法挑战记录 + public static Set familyKey = new HashSet<>(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/FastChallengeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/FastChallengeHandler.java index 7286f6067..41e69da25 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/FastChallengeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/FastChallengeHandler.java @@ -1,6 +1,7 @@ package com.ljsd.jieling.handler; import com.ljsd.jieling.core.GlobalsDef; +import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.exception.ErrorCode; import com.ljsd.jieling.exception.ErrorCodeException; @@ -69,6 +70,11 @@ public class FastChallengeHandler extends BaseHandler> infos = new LinkedHashSet<>(matchNums); + Set infos = new LinkedHashSet<>(matchNums); GuildInfo guildInfo = GuilidManager.guildInfoMap.get(guildId); Set members = new HashSet<>(); guildInfo.getMembers().values().forEach(integers ->members.addAll(integers)); @@ -47,30 +53,91 @@ public class GetCarChallengeListHandler extends BaseHandler { int zsetSize = RedisUtil.getInstence().getZsetSize(key); if(myRank == -1){ int start = zsetSize - matchNums; - int end=-1; - while (start>=0 && infos.size()> zsetreverseRangeWithScores = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.CAR_DEALY_RANK, "", start, end); - for(ZSetOperations.TypedTuple item : zsetreverseRangeWithScores){ - if(!members.contains(Integer.parseInt(item.getValue()))){ - zsetreverseRangeWithScores.add(item); - } - } - end=start; - start-=matchNums; + if(start<0){ + start=0; } + int end=-1; + process(start,end,members,matchNums,infos); }else{ //取前面 - /* int start = (int) (myRank - matchSection[0]); - while (start>0 && infos.size()> zsetreverseRangeWithScores = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.CAR_DEALY_RANK, "", start, end); - zsetreverseRangeWithScores.forEach(item->{ - if(!members.contains(Integer.parseInt(item.getValue()))){ - zsetreverseRangeWithScores.add(item); - } - }); + int topStart = myRank - matchSection[0]; + if(topStart<0){ + topStart=0; } - RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.CAR_DEALY_RANK, "", myRank - matchSection[0], myRank+5);*/ + int topEnd = myRank; + process(topStart,topEnd,members,matchNums,infos); + int downStart = myRank; + if(downStart<0){ + downStart=0; + } + int downEnd = myRank+matchSection[1]; + process(downStart,downEnd,members,matchNums,infos); + } + int myscore = 0; + if(myRank!=-1){ + myscore = RedisUtil.getInstence().getZSetScore(RedisKey.CAR_DEALY_RANK, "", String.valueOf(uid)).intValue(); + } + Family.GetCarChallenegListResponse.Builder builder = Family.GetCarChallenegListResponse.newBuilder().setMyRank(myRank).setMyScore(myscore); + Map records = RedisUtil.getInstence().getMapValues(RedisKey.CAR_CHALLENEG_SB, String.valueOf(uid), Integer.class, Integer.class); + for(ZsetTypedTupleWithRank typedTupleWithRankitem: infos){ + ZSetOperations.TypedTuple item = typedTupleWithRankitem.getItem(); + int challenegUid = Integer.parseInt(item.getValue()); + int rank = typedTupleWithRankitem.getRank(); + CommonProto.TeamOneInfo.Builder userTeamOneInfo = PlayerLogic.getInstance().getUserTeamOneInfo(challenegUid, GlobalsDef.CAR_DELAY_TEAM); + User challenegeUser = UserManager.getUser(challenegUid); + int challengeGuildId = challenegeUser.getPlayerInfoManager().getGuildId(); + Family.CarChallengeItem.Builder builder1 = Family.CarChallengeItem.newBuilder() + .setUid(challenegUid) + .setUserName(challenegeUser.getPlayerInfoManager().getNickName()) + .setScore(item.getScore().intValue()) + .setForce(0) + .setTeamInfo(userTeamOneInfo) + .setHadChallenge(records.containsKey(challenegUid)?1:0) + .setRank(rank); + if(challengeGuildId!=0){ + GuildInfo challenegeGuildInfo = GuilidManager.guildInfoMap.get(challenegeUser.getPlayerInfoManager().getGuildId()); + builder1.setGuildName(challenegeGuildInfo.getName()); + } + builder.addCarChallengeItem(builder1); + } + MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.GET_CAR_CHALLENEG_LIST_RESPONSE_VALUE,builder.build(),true); + + } + + + + private static void process(int start,int end,Set members,int matchNums, Set infos){ + while (start>=0 && infos.size()> zsetreverseRangeWithScores = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.CAR_DEALY_RANK, "", start, end); + for(ZSetOperations.TypedTuple item : zsetreverseRangeWithScores){ + if(!members.contains(Integer.parseInt(item.getValue()))){ + infos.add(new ZsetTypedTupleWithRank(item,rank++)); + } + } + end=start; + start-=matchNums; + if(end<=0){ + break; + } + } + } + + static class ZsetTypedTupleWithRank{ + ZSetOperations.TypedTuple item; + int rank; + + public ZsetTypedTupleWithRank(ZSetOperations.TypedTuple item, int rank) { + this.item = item; + this.rank = rank; + } + + public ZSetOperations.TypedTuple getItem() { + return item; + } + + public int getRank() { + return rank; } } } 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 4d7cd06cc..5750f5f8e 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 @@ -1228,19 +1228,18 @@ public class GuildFightLogic { public static Family.CarDelayProgressIndication carDelayProgressIndication; public static void minuteCheckForCarFight() throws Exception { + int carProgressTmp =carProgress; + int id =-1; TimeControllerOfFunction timeControllerOfFunction = GlobalDataManaager.getInstance().getTimeControllerOfFunctionByFunctinoType(FunctionIdEnum.Car_Delay); if (null == timeControllerOfFunction) { carProgress = -1; - carDelayProgressIndication= Family.CarDelayProgressIndication.newBuilder().setProgress(carProgress).build(); - return; - } - int times = timeControllerOfFunction.getTimes(); - long startTime = timeControllerOfFunction.getStartTime(); - - int size = STableManager.getConfig(SWorldBossConfig.class).size(); - int id = times%size; - if(id == 0){ - id = size; + }else{ + int times = timeControllerOfFunction.getTimes(); + int size = STableManager.getConfig(SWorldBossConfig.class).size(); + id = times%size; + if(id == 0){ + id = size; + } } Calendar calendar = Calendar.getInstance(); SWorldBossSetting sWorldBossSetting = STableManager.getConfig(SWorldBossSetting.class).get(1); @@ -1249,7 +1248,6 @@ public class GuildFightLogic { int hour = calendar.get(Calendar.HOUR_OF_DAY); int minute = calendar.get(Calendar.MINUTE); int endTime = 0; - int carProgressTmp =carProgress; int sourceCompare = hour*100 + minute; int battleCompareStart =battleTime[0][0]*100 + battleTime[0][1]; int battleCompaeEnd =battleTime[1][0]*100 + battleTime[1][1]; @@ -1276,14 +1274,17 @@ public class GuildFightLogic { calendar.set(calendar.SECOND,0); endTime = (int)(calendar.getTimeInMillis()/1000); + }else if(sourceCompare>=battleCompaeEnd && sourceCompare<=grapCompareStart){ + carProgressTmp = 2; }else{ carProgressTmp = -1; } if(carProgressTmp!=carProgress){ int battleStartTime = 0; int grapStartTime = 0; - Calendar instance = Calendar.getInstance(); - instance.setTimeInMillis(startTime); + if(sourceCompare>grapCompaeEnd){ + calendar.setTimeInMillis(calendar.getTimeInMillis() + 24*3600*1000L); + } calendar.set(calendar.HOUR_OF_DAY,grabTime[0][0]); calendar.set(calendar.MINUTE,grabTime[0][1]); calendar.set(calendar.SECOND,0); @@ -1295,7 +1296,6 @@ public class GuildFightLogic { calendar.set(calendar.SECOND,0); battleStartTime = (int)(calendar.getTimeInMillis()/1000); - carProgress = carProgressTmp; carDelayProgressIndication= Family.CarDelayProgressIndication.newBuilder().setBossIndexId(id).setProgress(carProgress).setEndTime(endTime). setBattleStartTime(battleStartTime).setGrabStartTime(grapStartTime).