back_recharge
lvxinran 2019-12-21 10:19:24 +08:00
commit e823180834
10 changed files with 2675 additions and 962 deletions

View File

@ -16366,6 +16366,564 @@ public final class ArenaInfoProto {
// @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ChampionViewFinalResponse)
}
public interface ChampionGuessSuccessIndicationOrBuilder
extends com.google.protobuf.MessageOrBuilder {
// optional int32 roundTimes = 1;
/**
* <code>optional int32 roundTimes = 1;</code>
*/
boolean hasRoundTimes();
/**
* <code>optional int32 roundTimes = 1;</code>
*/
int getRoundTimes();
// optional int32 itemId = 2;
/**
* <code>optional int32 itemId = 2;</code>
*/
boolean hasItemId();
/**
* <code>optional int32 itemId = 2;</code>
*/
int getItemId();
// optional int32 itemNum = 3;
/**
* <code>optional int32 itemNum = 3;</code>
*/
boolean hasItemNum();
/**
* <code>optional int32 itemNum = 3;</code>
*/
int getItemNum();
}
/**
* Protobuf type {@code com.ljsd.jieling.protocols.ChampionGuessSuccessIndication}
*/
public static final class ChampionGuessSuccessIndication extends
com.google.protobuf.GeneratedMessage
implements ChampionGuessSuccessIndicationOrBuilder {
// Use ChampionGuessSuccessIndication.newBuilder() to construct.
private ChampionGuessSuccessIndication(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
private ChampionGuessSuccessIndication(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final ChampionGuessSuccessIndication defaultInstance;
public static ChampionGuessSuccessIndication getDefaultInstance() {
return defaultInstance;
}
public ChampionGuessSuccessIndication getDefaultInstanceForType() {
return defaultInstance;
}
private final com.google.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
public final com.google.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private ChampionGuessSuccessIndication(
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;
roundTimes_ = input.readInt32();
break;
}
case 16: {
bitField0_ |= 0x00000002;
itemId_ = input.readInt32();
break;
}
case 24: {
bitField0_ |= 0x00000004;
itemNum_ = 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.ArenaInfoProto.internal_static_com_ljsd_jieling_protocols_ChampionGuessSuccessIndication_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.ljsd.jieling.protocols.ArenaInfoProto.internal_static_com_ljsd_jieling_protocols_ChampionGuessSuccessIndication_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication.class, com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication.Builder.class);
}
public static com.google.protobuf.Parser<ChampionGuessSuccessIndication> PARSER =
new com.google.protobuf.AbstractParser<ChampionGuessSuccessIndication>() {
public ChampionGuessSuccessIndication parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return new ChampionGuessSuccessIndication(input, extensionRegistry);
}
};
@java.lang.Override
public com.google.protobuf.Parser<ChampionGuessSuccessIndication> getParserForType() {
return PARSER;
}
private int bitField0_;
// optional int32 roundTimes = 1;
public static final int ROUNDTIMES_FIELD_NUMBER = 1;
private int roundTimes_;
/**
* <code>optional int32 roundTimes = 1;</code>
*/
public boolean hasRoundTimes() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>optional int32 roundTimes = 1;</code>
*/
public int getRoundTimes() {
return roundTimes_;
}
// optional int32 itemId = 2;
public static final int ITEMID_FIELD_NUMBER = 2;
private int itemId_;
/**
* <code>optional int32 itemId = 2;</code>
*/
public boolean hasItemId() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>optional int32 itemId = 2;</code>
*/
public int getItemId() {
return itemId_;
}
// optional int32 itemNum = 3;
public static final int ITEMNUM_FIELD_NUMBER = 3;
private int itemNum_;
/**
* <code>optional int32 itemNum = 3;</code>
*/
public boolean hasItemNum() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* <code>optional int32 itemNum = 3;</code>
*/
public int getItemNum() {
return itemNum_;
}
private void initFields() {
roundTimes_ = 0;
itemId_ = 0;
itemNum_ = 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, roundTimes_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt32(2, itemId_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeInt32(3, itemNum_);
}
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, roundTimes_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(2, itemId_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(3, itemNum_);
}
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.ArenaInfoProto.ChampionGuessSuccessIndication parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication 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.ArenaInfoProto.ChampionGuessSuccessIndication parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication 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.ArenaInfoProto.ChampionGuessSuccessIndication parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
public static com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication 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.ArenaInfoProto.ChampionGuessSuccessIndication parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication 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.ArenaInfoProto.ChampionGuessSuccessIndication 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.ChampionGuessSuccessIndication}
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder<Builder>
implements com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndicationOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.ljsd.jieling.protocols.ArenaInfoProto.internal_static_com_ljsd_jieling_protocols_ChampionGuessSuccessIndication_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.ljsd.jieling.protocols.ArenaInfoProto.internal_static_com_ljsd_jieling_protocols_ChampionGuessSuccessIndication_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication.class, com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication.Builder.class);
}
// Construct using com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication.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();
roundTimes_ = 0;
bitField0_ = (bitField0_ & ~0x00000001);
itemId_ = 0;
bitField0_ = (bitField0_ & ~0x00000002);
itemNum_ = 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.ArenaInfoProto.internal_static_com_ljsd_jieling_protocols_ChampionGuessSuccessIndication_descriptor;
}
public com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication getDefaultInstanceForType() {
return com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication.getDefaultInstance();
}
public com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication build() {
com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
public com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication buildPartial() {
com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication result = new com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
to_bitField0_ |= 0x00000001;
}
result.roundTimes_ = roundTimes_;
if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
to_bitField0_ |= 0x00000002;
}
result.itemId_ = itemId_;
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004;
}
result.itemNum_ = itemNum_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication) {
return mergeFrom((com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication)other);
} else {
super.mergeFrom(other);
return this;
}
}
public Builder mergeFrom(com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication other) {
if (other == com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication.getDefaultInstance()) return this;
if (other.hasRoundTimes()) {
setRoundTimes(other.getRoundTimes());
}
if (other.hasItemId()) {
setItemId(other.getItemId());
}
if (other.hasItemNum()) {
setItemNum(other.getItemNum());
}
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.ArenaInfoProto.ChampionGuessSuccessIndication parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.ljsd.jieling.protocols.ArenaInfoProto.ChampionGuessSuccessIndication) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
mergeFrom(parsedMessage);
}
}
return this;
}
private int bitField0_;
// optional int32 roundTimes = 1;
private int roundTimes_ ;
/**
* <code>optional int32 roundTimes = 1;</code>
*/
public boolean hasRoundTimes() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>optional int32 roundTimes = 1;</code>
*/
public int getRoundTimes() {
return roundTimes_;
}
/**
* <code>optional int32 roundTimes = 1;</code>
*/
public Builder setRoundTimes(int value) {
bitField0_ |= 0x00000001;
roundTimes_ = value;
onChanged();
return this;
}
/**
* <code>optional int32 roundTimes = 1;</code>
*/
public Builder clearRoundTimes() {
bitField0_ = (bitField0_ & ~0x00000001);
roundTimes_ = 0;
onChanged();
return this;
}
// optional int32 itemId = 2;
private int itemId_ ;
/**
* <code>optional int32 itemId = 2;</code>
*/
public boolean hasItemId() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>optional int32 itemId = 2;</code>
*/
public int getItemId() {
return itemId_;
}
/**
* <code>optional int32 itemId = 2;</code>
*/
public Builder setItemId(int value) {
bitField0_ |= 0x00000002;
itemId_ = value;
onChanged();
return this;
}
/**
* <code>optional int32 itemId = 2;</code>
*/
public Builder clearItemId() {
bitField0_ = (bitField0_ & ~0x00000002);
itemId_ = 0;
onChanged();
return this;
}
// optional int32 itemNum = 3;
private int itemNum_ ;
/**
* <code>optional int32 itemNum = 3;</code>
*/
public boolean hasItemNum() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* <code>optional int32 itemNum = 3;</code>
*/
public int getItemNum() {
return itemNum_;
}
/**
* <code>optional int32 itemNum = 3;</code>
*/
public Builder setItemNum(int value) {
bitField0_ |= 0x00000004;
itemNum_ = value;
onChanged();
return this;
}
/**
* <code>optional int32 itemNum = 3;</code>
*/
public Builder clearItemNum() {
bitField0_ = (bitField0_ & ~0x00000004);
itemNum_ = 0;
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ChampionGuessSuccessIndication)
}
static {
defaultInstance = new ChampionGuessSuccessIndication(true);
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ChampionGuessSuccessIndication)
}
private static com.google.protobuf.Descriptors.Descriptor
internal_static_com_ljsd_jieling_protocols_GetArenaInfoResponse_descriptor;
private static
@ -16476,6 +17034,11 @@ public final class ArenaInfoProto {
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_ljsd_jieling_protocols_ChampionViewFinalResponse_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
internal_static_com_ljsd_jieling_protocols_ChampionGuessSuccessIndication_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_ljsd_jieling_protocols_ChampionGuessSuccessIndication_fieldAccessorTable;
public static com.google.protobuf.Descriptors.FileDescriptor
getDescriptor() {
@ -16545,7 +17108,9 @@ public final class ArenaInfoProto {
"mpionViewFinalRequest\022\014\n\004type\030\001 \001(\005\"o\n\031C" +
"hampionViewFinalResponse\022R\n\026championBatt" +
"lePairInfo\030\001 \003(\01322.com.ljsd.jieling.prot",
"ocols.ChampionBattlePairInfoB\002H\001"
"ocols.ChampionBattlePairInfo\"U\n\036Champion" +
"GuessSuccessIndication\022\022\n\nroundTimes\030\001 \001" +
"(\005\022\016\n\006itemId\030\002 \001(\005\022\017\n\007itemNum\030\003 \001(\005B\002H\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -16684,6 +17249,12 @@ public final class ArenaInfoProto {
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_ChampionViewFinalResponse_descriptor,
new java.lang.String[] { "ChampionBattlePairInfo", });
internal_static_com_ljsd_jieling_protocols_ChampionGuessSuccessIndication_descriptor =
getDescriptor().getMessageTypes().get(22);
internal_static_com_ljsd_jieling_protocols_ChampionGuessSuccessIndication_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_ChampionGuessSuccessIndication_descriptor,
new java.lang.String[] { "RoundTimes", "ItemId", "ItemNum", });
return null;
}
};

View File

@ -1259,6 +1259,24 @@ public final class CommonProto {
* </pre>
*/
int getRideLevel();
// optional int32 sex = 24;
/**
* <code>optional int32 sex = 24;</code>
*
* <pre>
* 01
* </pre>
*/
boolean hasSex();
/**
* <code>optional int32 sex = 24;</code>
*
* <pre>
* 01
* </pre>
*/
int getSex();
}
/**
* Protobuf type {@code com.ljsd.jieling.protocols.Player}
@ -1426,6 +1444,11 @@ public final class CommonProto {
rideLevel_ = input.readInt32();
break;
}
case 192: {
bitField0_ |= 0x00800000;
sex_ = input.readInt32();
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -2012,6 +2035,30 @@ public final class CommonProto {
return rideLevel_;
}
// optional int32 sex = 24;
public static final int SEX_FIELD_NUMBER = 24;
private int sex_;
/**
* <code>optional int32 sex = 24;</code>
*
* <pre>
* 01
* </pre>
*/
public boolean hasSex() {
return ((bitField0_ & 0x00800000) == 0x00800000);
}
/**
* <code>optional int32 sex = 24;</code>
*
* <pre>
* 01
* </pre>
*/
public int getSex() {
return sex_;
}
private void initFields() {
uid_ = 0;
nickName_ = "";
@ -2036,6 +2083,7 @@ public final class CommonProto {
decrotion_ = 0;
ride_ = 0;
rideLevel_ = 0;
sex_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@ -2118,6 +2166,9 @@ public final class CommonProto {
if (((bitField0_ & 0x00400000) == 0x00400000)) {
output.writeInt32(23, rideLevel_);
}
if (((bitField0_ & 0x00800000) == 0x00800000)) {
output.writeInt32(24, sex_);
}
getUnknownFields().writeTo(output);
}
@ -2219,6 +2270,10 @@ public final class CommonProto {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(23, rideLevel_);
}
if (((bitField0_ & 0x00800000) == 0x00800000)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(24, sex_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@ -2381,6 +2436,8 @@ public final class CommonProto {
bitField0_ = (bitField0_ & ~0x00200000);
rideLevel_ = 0;
bitField0_ = (bitField0_ & ~0x00400000);
sex_ = 0;
bitField0_ = (bitField0_ & ~0x00800000);
return this;
}
@ -2501,6 +2558,10 @@ public final class CommonProto {
to_bitField0_ |= 0x00400000;
}
result.rideLevel_ = rideLevel_;
if (((from_bitField0_ & 0x00800000) == 0x00800000)) {
to_bitField0_ |= 0x00800000;
}
result.sex_ = sex_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@ -2590,6 +2651,9 @@ public final class CommonProto {
if (other.hasRideLevel()) {
setRideLevel(other.getRideLevel());
}
if (other.hasSex()) {
setSex(other.getSex());
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@ -3706,6 +3770,55 @@ public final class CommonProto {
return this;
}
// optional int32 sex = 24;
private int sex_ ;
/**
* <code>optional int32 sex = 24;</code>
*
* <pre>
* 01
* </pre>
*/
public boolean hasSex() {
return ((bitField0_ & 0x00800000) == 0x00800000);
}
/**
* <code>optional int32 sex = 24;</code>
*
* <pre>
* 01
* </pre>
*/
public int getSex() {
return sex_;
}
/**
* <code>optional int32 sex = 24;</code>
*
* <pre>
* 01
* </pre>
*/
public Builder setSex(int value) {
bitField0_ |= 0x00800000;
sex_ = value;
onChanged();
return this;
}
/**
* <code>optional int32 sex = 24;</code>
*
* <pre>
* 01
* </pre>
*/
public Builder clearSex() {
bitField0_ = (bitField0_ & ~0x00800000);
sex_ = 0;
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.Player)
}
@ -81037,6 +81150,24 @@ public final class CommonProto {
* </pre>
*/
int getPosition();
// optional int32 isGUess = 8;
/**
* <code>optional int32 isGUess = 8;</code>
*
* <pre>
*0 1
* </pre>
*/
boolean hasIsGUess();
/**
* <code>optional int32 isGUess = 8;</code>
*
* <pre>
*0 1
* </pre>
*/
int getIsGUess();
}
/**
* Protobuf type {@code com.ljsd.jieling.protocols.ChampionBattlePairInfo}
@ -81124,6 +81255,11 @@ public final class CommonProto {
position_ = input.readInt32();
break;
}
case 64: {
bitField0_ |= 0x00000080;
isGUess_ = input.readInt32();
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -81401,6 +81537,30 @@ public final class CommonProto {
return position_;
}
// optional int32 isGUess = 8;
public static final int ISGUESS_FIELD_NUMBER = 8;
private int isGUess_;
/**
* <code>optional int32 isGUess = 8;</code>
*
* <pre>
*0 1
* </pre>
*/
public boolean hasIsGUess() {
return ((bitField0_ & 0x00000080) == 0x00000080);
}
/**
* <code>optional int32 isGUess = 8;</code>
*
* <pre>
*0 1
* </pre>
*/
public int getIsGUess() {
return isGUess_;
}
private void initFields() {
attackName_ = "";
defName_ = "";
@ -81409,6 +81569,7 @@ public final class CommonProto {
roundTImes_ = 0;
teamId_ = 0;
position_ = 0;
isGUess_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@ -81443,6 +81604,9 @@ public final class CommonProto {
if (((bitField0_ & 0x00000040) == 0x00000040)) {
output.writeInt32(7, position_);
}
if (((bitField0_ & 0x00000080) == 0x00000080)) {
output.writeInt32(8, isGUess_);
}
getUnknownFields().writeTo(output);
}
@ -81480,6 +81644,10 @@ public final class CommonProto {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(7, position_);
}
if (((bitField0_ & 0x00000080) == 0x00000080)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(8, isGUess_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@ -81610,6 +81778,8 @@ public final class CommonProto {
bitField0_ = (bitField0_ & ~0x00000020);
position_ = 0;
bitField0_ = (bitField0_ & ~0x00000040);
isGUess_ = 0;
bitField0_ = (bitField0_ & ~0x00000080);
return this;
}
@ -81666,6 +81836,10 @@ public final class CommonProto {
to_bitField0_ |= 0x00000040;
}
result.position_ = position_;
if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
to_bitField0_ |= 0x00000080;
}
result.isGUess_ = isGUess_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@ -81709,6 +81883,9 @@ public final class CommonProto {
if (other.hasPosition()) {
setPosition(other.getPosition());
}
if (other.hasIsGUess()) {
setIsGUess(other.getIsGUess());
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@ -82178,6 +82355,55 @@ public final class CommonProto {
return this;
}
// optional int32 isGUess = 8;
private int isGUess_ ;
/**
* <code>optional int32 isGUess = 8;</code>
*
* <pre>
*0 1
* </pre>
*/
public boolean hasIsGUess() {
return ((bitField0_ & 0x00000080) == 0x00000080);
}
/**
* <code>optional int32 isGUess = 8;</code>
*
* <pre>
*0 1
* </pre>
*/
public int getIsGUess() {
return isGUess_;
}
/**
* <code>optional int32 isGUess = 8;</code>
*
* <pre>
*0 1
* </pre>
*/
public Builder setIsGUess(int value) {
bitField0_ |= 0x00000080;
isGUess_ = value;
onChanged();
return this;
}
/**
* <code>optional int32 isGUess = 8;</code>
*
* <pre>
*0 1
* </pre>
*/
public Builder clearIsGUess() {
bitField0_ = (bitField0_ & ~0x00000080);
isGUess_ = 0;
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ChampionBattlePairInfo)
}
@ -82650,7 +82876,7 @@ public final class CommonProto {
java.lang.String[] descriptorData = {
"\n\021CommonProto.proto\022\032com.ljsd.jieling.pr" +
"otocols\"C\n\rErrorResponse\022\017\n\007errCode\030\001 \001(" +
"\005\022\016\n\006errMsg\030\002 \001(\t\022\021\n\terrParams\030\003 \003(\t\"\267\003\n" +
"\005\022\016\n\006errMsg\030\002 \001(\t\022\021\n\terrParams\030\003 \003(\t\"\304\003\n" +
"\006Player\022\013\n\003uid\030\001 \001(\005\022\020\n\010nickName\030\002 \001(\t\022\r" +
"\n\005level\030\003 \001(\005\022\013\n\003exp\030\004 \001(\005\022\020\n\010vipLevel\030\005" +
" \001(\005\022\020\n\010familyId\030\006 \001(\005\022\014\n\004head\030\007 \001(\005\022\020\n\010" +
@ -82661,236 +82887,236 @@ public final class CommonProto {
"(\005\022\023\n\013isMatchRoom\030\020 \001(\005\022\023\n\013curRoomType\030\021" +
" \001(\005\022\021\n\theadFrame\030\022 \001(\005\022\024\n\014roomAddreess\030" +
"\023 \001(\t\022\023\n\013designation\030\024 \001(\005\022\021\n\tdecrotion\030" +
"\025 \001(\005\022\014\n\004ride\030\026 \001(\005\022\021\n\trideLevel\030\027 \001(\005\"*" +
"\n\tPrivilege\022\n\n\002id\030\001 \001(\005\022\021\n\tusedTimes\030\002 \001" +
"(\005\"R\n\004Item\022\016\n\006itemId\030\001 \001(\005\022\017\n\007itemNum\030\002 " +
"\001(\005\022\022\n\nendingTime\030\003 \001(\005\022\025\n\rnextFlushTime" +
"\030\004 \001(\005\";\n\016SpecialEffects\022\022\n\npropertyId\030\001" +
" \001(\005\022\025\n\rpropertyValue\030\002 \001(\005\"\206\002\n\005Equip\022\n\n" +
"\002id\030\001 \001(\t\022\017\n\007equipId\030\002 \001(\005\022A\n\rmainAttrib",
"ute\030\003 \001(\0132*.com.ljsd.jieling.protocols.S" +
"pecialEffects\022C\n\017secondAttribute\030\004 \003(\0132*" +
".com.ljsd.jieling.protocols.SpecialEffec" +
"ts\022\024\n\014rebuildLevel\030\005 \001(\005\022\022\n\ncreateTime\030\006" +
" \001(\005\022\017\n\007skillId\030\007 \001(\005\022\020\n\010isLocked\030\010 \001(\005\022" +
"\013\n\003exp\030\t \001(\005\",\n\007SoulPos\022\017\n\007equipId\030\001 \001(\t" +
"\022\020\n\010position\030\002 \001(\005\"\376\001\n\004Hero\022\n\n\002id\030\001 \001(\t\022" +
"\016\n\006heroId\030\002 \001(\005\022\r\n\005level\030\003 \001(\005\022\017\n\007breakI" +
"d\030\004 \001(\005\022\014\n\004star\030\005 \001(\005\022\016\n\006skinId\030\006 \001(\005\022\023\n" +
"\013equipIdList\030\010 \003(\t\022\022\n\ncreateTime\030\t \001(\005\022\023",
"\n\013starBreakId\030\n \001(\005\022\025\n\respecialEquip\030\013 \003" +
"(\t\0224\n\007soulPos\030\014 \003(\0132#.com.ljsd.jieling.p" +
"rotocols.SoulPos\022\021\n\tlockState\030\r \001(\005\"G\n\rF" +
"ightUnitInfo\022\016\n\006unitId\030\001 \001(\t\022\024\n\014unitSkil" +
"lIds\030\002 \001(\t\022\020\n\010property\030\003 \001(\t\"\201\001\n\rFightTe" +
"amInfo\022@\n\rfightUnitList\030\001 \003(\0132).com.ljsd" +
".jieling.protocols.FightUnitInfo\022\025\n\rteam" +
"SkillList\030\002 \001(\t\022\027\n\017teamPassiveList\030\003 \001(\t" +
"\"-\n\023EventBehaviorValues\022\026\n\016behaviorValue" +
"s\030\001 \003(\005\"y\n\023EventBehaviorCommon\022\024\n\014behavi",
"orType\030\001 \001(\005\022L\n\023eventBehaviorValues\030\002 \003(" +
"\0132/.com.ljsd.jieling.protocols.EventBeha" +
"viorValues\"=\n\004Cell\022\016\n\006cellId\030\001 \001(\005\022\017\n\007po" +
"intId\030\002 \001(\005\022\024\n\014monsterForce\030\003 \001(\005\"^\n\007Mis" +
"sion\022\016\n\006itemId\030\001 \001(\005\022\r\n\005state\030\002 \001(\t\022\023\n\013m" +
"issionStep\030\003 \001(\005\022\014\n\004time\030\004 \001(\005\022\021\n\tdeadTi" +
"mes\030\005 \001(\005\"\243\001\n\004Mail\022\016\n\006mailId\030\001 \001(\t\022\r\n\005st" +
"ate\030\002 \001(\005\022\014\n\004head\030\003 \001(\t\022\017\n\007content\030\004 \001(\t" +
"\022\020\n\010mailItem\030\005 \001(\t\022\020\n\010sendTime\030\006 \001(\005\022\025\n\r" +
"effectiveTime\030\007 \001(\005\022\020\n\010sendName\030\010 \001(\t\022\020\n",
"\010mailType\030\t \001(\005\"\220\002\n\004Drop\0222\n\010itemlist\030\001 \003" +
"(\0132 .com.ljsd.jieling.protocols.Item\0222\n\007" +
"equipId\030\002 \003(\0132!.com.ljsd.jieling.protoco" +
"ls.Equip\022.\n\004Hero\030\003 \003(\0132 .com.ljsd.jielin" +
"g.protocols.Hero\022:\n\017especialEquipId\030\004 \003(" +
"\0132!.com.ljsd.jieling.protocols.Equip\0224\n\t" +
"soulEquip\030\005 \003(\0132!.com.ljsd.jieling.proto" +
"cols.Equip\"\034\n\tGMCommand\022\017\n\007command\030\001 \001(\t" +
"\"0\n\014TeamHeroInfo\022\020\n\010position\030\001 \001(\005\022\016\n\006he" +
"roId\030\002 \001(\t\"6\n\017TeamPokemonInfo\022\020\n\010positio",
"n\030\001 \001(\005\022\021\n\tpokemonId\030\002 \001(\005\"\267\001\n\013TeamPosIn" +
"fo\022\016\n\006teamId\030\001 \001(\005\022\020\n\010teamName\030\002 \001(\t\022?\n\r" +
"teamHeroInfos\030\003 \003(\0132(.com.ljsd.jieling.p" +
"rotocols.TeamHeroInfo\022E\n\020teamPokemonInfo" +
"s\030\004 \003(\0132+.com.ljsd.jieling.protocols.Tea" +
"mPokemonInfo\"-\n\020Pokemoncomonpent\022\n\n\002id\030\001" +
" \001(\005\022\r\n\005level\030\002 \001(\005\"p\n\013PokemonInfo\022\n\n\002id" +
"\030\001 \001(\005\022\r\n\005stage\030\002 \001(\005\022F\n\020pokemoncomonpen" +
"t\030\003 \003(\0132,.com.ljsd.jieling.protocols.Pok" +
"emoncomonpent\">\n\014RingFireInfo\022\n\n\002id\030\001 \001(",
"\005\022\r\n\005stage\030\002 \001(\005\022\023\n\013comonpentId\030\003 \003(\005\"<\n" +
"\020WorkShopBaseInfo\022\014\n\004type\030\001 \001(\005\022\r\n\005levle" +
"\030\002 \001(\005\022\013\n\003exp\030\003 \001(\005\".\n\022WorkShopUnLockInf" +
"o\022\014\n\004type\030\001 \001(\005\022\n\n\002id\030\004 \003(\005\"\312\001\n\tFightDat" +
"a\022A\n\016heroFightInfos\030\001 \001(\0132).com.ljsd.jie" +
"ling.protocols.FightTeamInfo\022>\n\013monsterL" +
"ist\030\002 \003(\0132).com.ljsd.jieling.protocols.F" +
"ightTeamInfo\022\021\n\tfightSeed\030\003 \001(\005\022\024\n\014fight" +
"MaxTime\030\004 \001(\005\022\021\n\tfightType\030\005 \001(\005\"-\n\rExpl" +
"oreDetail\022\n\n\002id\030\001 \001(\005\022\020\n\010progress\030\002 \001(\005\"",
"0\n\nFoodBuffer\022\020\n\010bufferId\030\001 \001(\005\022\020\n\010leftS" +
"tep\030\002 \001(\005\"/\n\023NewPlayerGuidePoint\022\014\n\004type" +
"\030\001 \001(\005\022\n\n\002id\030\002 \001(\005\"L\n\017LevelDifficulty\022\017\n" +
"\007fightId\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\022\013\n\003num\030\003 \001" +
"(\005\022\014\n\004type\030\004 \001(\005\"l\n\024LevelDifficultyInfos" +
"\022\016\n\006areaId\030\001 \001(\005\022D\n\017LevelDifficulty\030\002 \003(" +
"\0132+.com.ljsd.jieling.protocols.LevelDiff" +
"iculty\":\n\007MapInfo\022\r\n\005mapId\030\001 \001(\005\022\021\n\tleas" +
"tTime\030\002 \001(\005\022\r\n\005stars\030\003 \003(\005\"\363\001\n\014ActivityI" +
"nfo\022\022\n\nactivityId\030\001 \002(\005\022E\n\007mission\030\002 \003(\013",
"24.com.ljsd.jieling.protocols.ActivityIn" +
"fo.MissionInfo\022\r\n\005value\030\006 \001(\005\022\021\n\tstartTi" +
"me\030\005 \001(\005\022\017\n\007endTime\030\003 \001(\005\022\022\n\nreallyOpen\030" +
"\004 \001(\005\032A\n\013MissionInfo\022\021\n\tmissionId\030\001 \002(\005\022" +
"\020\n\010progress\030\002 \002(\005\022\r\n\005state\030\003 \002(\005\"J\n\nGmRe" +
"sponse\022.\n\004drop\030\001 \001(\0132 .com.ljsd.jieling." +
"protocols.Drop\022\014\n\004info\030\002 \001(\t\"\215\001\n\017ArenaPe" +
"rsonInfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\022\014\n\004" +
"name\030\003 \001(\t\022\r\n\005score\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022" +
"\014\n\004rank\030\006 \001(\005\022\022\n\ntotalForce\030\007 \001(\005\022\021\n\thea",
"dFrame\030\010 \001(\005\"\027\n\004Team\022\017\n\007heroTid\030\001 \003(\005\"}\n" +
"\nArenaEnemy\022?\n\npersonInfo\030\001 \001(\0132+.com.lj" +
"sd.jieling.protocols.ArenaPersonInfo\022.\n\004" +
"team\030\002 \001(\0132 .com.ljsd.jieling.protocols." +
"Team\"~\n\tArenaInfo\022\020\n\010failNums\030\001 \001(\005\022\023\n\013s" +
"uccessNums\030\002 \001(\005\022\r\n\005score\030\003 \001(\005\022;\n\013arena" +
"Enemys\030\004 \003(\0132&.com.ljsd.jieling.protocol" +
"s.ArenaEnemy\"\'\n\tStoreItem\022\n\n\002id\030\001 \001(\005\022\016\n" +
"\006buyNum\030\002 \001(\005\"\216\001\n\tStoreInfo\022\n\n\002id\030\001 \001(\005\022" +
"\027\n\017lastRefreshTime\030\002 \001(\003\022\021\n\tstartTime\030\004 ",
"\001(\003\022\017\n\007endTime\030\005 \001(\003\0228\n\tstoreItem\030\006 \003(\0132" +
"%.com.ljsd.jieling.protocols.StoreItem\"\236" +
"\001\n\017ArenaRecordInfo\022\n\n\002id\030\001 \001(\t\022?\n\nattack" +
"Info\030\002 \001(\0132+.com.ljsd.jieling.protocols." +
"ArenaPersonInfo\022\022\n\nattackTime\030\003 \001(\005\022\025\n\rm" +
"yScoreChange\030\004 \001(\005\022\023\n\013fightResult\030\005 \001(\005\"" +
"Z\n\016FunctionOfTime\022\022\n\nfunctionId\030\001 \001(\005\022\021\n" +
"\tstartTime\030\002 \001(\005\022\017\n\007endTime\030\003 \001(\005\022\020\n\010int" +
"erval\030\004 \001(\005\"~\n\025AdventureRankItemInfo\022\r\n\005" +
"level\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\014\n\004hurt\030\003 \001(\005\022",
"\014\n\004head\030\004 \001(\005\022\014\n\004rank\030\005 \001(\005\022\021\n\theadFrame" +
"\030\006 \001(\005\022\013\n\003uid\030\007 \001(\005\"\313\001\n\021AdventureBossInf" +
"o\022\017\n\007arenaId\030\001 \001(\005\022\017\n\007findUid\030\002 \001(\005\022\020\n\010f" +
"indName\030\003 \001(\t\022\016\n\006bossId\030\004 \001(\t\022\023\n\013bossGro" +
"upId\030\005 \001(\005\022\016\n\006myHurt\030\006 \001(\005\022\021\n\tlevelTime\030" +
"\007 \001(\005\022\017\n\007totalHp\030\010 \001(\005\022\025\n\rbossRemainlHp\030" +
"\t \001(\005\022\022\n\narenaLevel\030\n \001(\005\"v\n\017UserMission" +
"Info\022\021\n\tmissionId\030\001 \001(\005\022\020\n\010progress\030\002 \001(" +
"\005\022\r\n\005state\030\003 \001(\005\022\014\n\004type\030\004 \001(\005\022\021\n\ttakeTi" +
"mes\030\005 \001(\005\022\016\n\006heroId\030\006 \003(\t\"8\n\013VipBaseInfo",
"\022\020\n\010vipLevel\030\001 \001(\005\022\027\n\017hadTakeLevelBox\030\002 " +
"\001(\005\"\250\001\n\006Friend\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t" +
"\022\n\n\002lv\030\003 \001(\005\022\023\n\013offLineTime\030\004 \001(\004\022\022\n\nhav" +
"eReward\030\005 \001(\005\022\016\n\006isGive\030\006 \001(\005\022\021\n\tisApply" +
"ed\030\007 \001(\005\022\014\n\004head\030\014 \001(\005\022\r\n\005frame\030\r \001(\005\022\017\n" +
"\007soulVal\030\016 \001(\005\"V\n\rGiftGoodsInfo\022\017\n\007goods" +
"Id\030\001 \001(\005\022\020\n\010buyTimes\030\002 \001(\005\022\021\n\tstartTime\030" +
"\003 \001(\005\022\017\n\007endTime\030\004 \001(\005\"7\n\021GoodsTypeDurat" +
"ion\022\021\n\tgoodsType\030\001 \001(\005\022\017\n\007endTime\030\002 \001(\005\"" +
"/\n\016TechnologyInfo\022\016\n\006techId\030\001 \001(\005\022\r\n\005lev",
"le\030\002 \001(\005\"J\n\020SuddenlyBossInfo\022\022\n\nsuddBoss" +
"Id\030\006 \001(\005\022\017\n\007endTime\030\007 \001(\005\022\021\n\tfindMapId\030\010" +
" \001(\005\"H\n\010ItemInfo\022\022\n\ntemplateId\030\001 \001(\005\022\017\n\007" +
"overlap\030\002 \001(\005\022\027\n\017nextRefreshTime\030\003 \001(\005\"H" +
"\n\010RankInfo\022\014\n\004rank\030\001 \001(\005\022\016\n\006param1\030\002 \001(\005" +
"\022\016\n\006param2\030\003 \001(\005\022\016\n\006param3\030\004 \001(\005\"\263\001\n\010Use" +
"rRank\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\022\014\n\004hea" +
"d\030\003 \001(\005\022\020\n\010userName\030\004 \001(\t\0226\n\010rankInfo\030\005 " +
"\001(\0132$.com.ljsd.jieling.protocols.RankInf" +
"o\022\021\n\theadFrame\030\006 \001(\005\022\021\n\tguildName\030\007 \001(\t\022",
"\r\n\005force\030\010 \001(\005\"\204\001\n\025ActorEffectBufferInfo" +
"\022\n\n\002id\030\001 \001(\005\022\014\n\004type\030\002 \001(\005\022\021\n\tstartTime\030" +
"\003 \001(\005\022\017\n\007endTime\030\004 \001(\005\022\016\n\006target\030\005 \001(\005\022\016" +
"\n\006caster\030\006 \001(\005\022\r\n\005value\030\007 \003(\005\"T\n\016BloodyH" +
"eroInfo\022\016\n\006heroId\030\001 \001(\t\022\016\n\006heroHp\030\002 \001(\005\022" +
"\021\n\theroMaxHp\030\003 \001(\005\022\017\n\007heroTid\030\004 \001(\005\"%\n\010S" +
"ceneMsg\022\014\n\004time\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\"\'\n\nPo" +
"sMineral\022\013\n\003pos\030\001 \001(\005\022\014\n\004nums\030\002 \001(\005\"\264\001\n\010" +
"Creature\022\014\n\004path\030\001 \003(\005\022\r\n\005speed\030\002 \001(\005\022\r\n" +
"\005maxHp\030\003 \001(\005\022\r\n\005curHp\030\004 \001(\005\022\017\n\007mineral\030\005",
" \001(\005\022\014\n\004camp\030\006 \001(\005\022<\n\010heroInfo\030\007 \003(\0132*.c" +
"om.ljsd.jieling.protocols.BloodyHeroInfo" +
"\022\020\n\010killNums\030\010 \001(\005\"\217\001\n\nSceneActor\022\n\n\002id\030" +
"\001 \001(\005\022\016\n\006curPos\030\002 \001(\005\022\r\n\005state\030\003 \001(\005\022\014\n\004" +
"type\030\004 \001(\005\0226\n\010Creature\030\006 \001(\0132$.com.ljsd." +
"jieling.protocols.Creature\022\020\n\010userName\030\007" +
" \001(\t\"\236\002\n\tSceneInfo\022\016\n\006roomId\030\001 \001(\005\022\r\n\005ma" +
"pId\030\002 \001(\005\022:\n\nSceneActor\030\003 \003(\0132&.com.ljsd" +
".jieling.protocols.SceneActor\022P\n\025actorEf" +
"fectBufferInfo\030\004 \003(\01321.com.ljsd.jieling.",
"protocols.ActorEffectBufferInfo\022\024\n\014barri" +
"erPoint\030\005 \003(\005\022:\n\nposMineral\030\006 \003(\0132&.com." +
"ljsd.jieling.protocols.PosMineral\022\022\n\nrem" +
"ainTime\030\007 \001(\005\"S\n\027SceneGetFullMsgResponse" +
"\0228\n\tsceneInfo\030\001 \001(\0132%.com.ljsd.jieling.p" +
"rotocols.SceneInfo\"B\n\013blessReward\022\022\n\nloc" +
"ationId\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\022\020\n\010rewardId" +
"\030\003 \001(\005\"5\n\022fiveResetTowerInfo\022\r\n\005tower\030\001 " +
"\001(\005\022\020\n\010intoType\030\002 \001(\005\";\n\020FamilyContribut" +
"e\022\013\n\003win\030\001 \001(\005\022\014\n\004draw\030\002 \001(\005\022\014\n\004fail\030\003 \001",
"(\005\"\210\002\n\016FamilyBaseInfo\022\n\n\002id\030\001 \001(\005\022\014\n\004nam" +
"e\030\002 \001(\t\022\017\n\007annouce\030\003 \001(\t\022\r\n\005levle\030\004 \001(\005\022" +
"\013\n\003exp\030\005 \001(\005\022\020\n\010totalNum\030\006 \001(\005\022\016\n\006maxNum" +
"\030\007 \001(\005\022\020\n\010joinType\030\010 \001(\005\022\014\n\004icon\030\t \001(\005\022\021" +
"\n\tlevelTime\030\n \001(\005\022A\n\013fightResult\030\013 \001(\0132," +
".com.ljsd.jieling.protocols.FamilyContri" +
"bute\022\027\n\017playerIntoLevel\030\014 \001(\005\")\n\013endless" +
"Hero\022\016\n\006heroId\030\001 \001(\t\022\n\n\002hp\030\002 \001(\005\"2\n\022Endl" +
"essRefreshInfo\022\016\n\006cellId\030\001 \001(\005\022\014\n\004time\030\002" +
" \001(\005\"u\n\014UseForceInfo\022\014\n\004name\030\001 \001(\t\022\014\n\004le",
"ve\030\002 \001(\005\022\r\n\005force\030\003 \001(\005\022\014\n\004rank\030\004 \001(\005\022\014\n" +
"\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\022\013\n\003uid\030\007 " +
"\001(\005\"H\n\013endlessSign\022\r\n\005mapId\030\001 \001(\005\022\016\n\006cel" +
"lId\030\002 \001(\005\022\014\n\004info\030\003 \001(\t\022\014\n\004type\030\004 \001(\005\"g\n" +
"\nExpertInfo\022\014\n\004name\030\001 \001(\t\022\r\n\005score\030\002 \001(\005" +
"\022\014\n\004rank\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\022\014\n\004head\030\005 " +
"\001(\005\022\021\n\theadFrame\030\006 \001(\005\")\n\nSignInInfo\022\014\n\004" +
"days\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\"N\n\016TeamSimpleI" +
"nfo\022\016\n\006heroid\030\001 \001(\t\022\017\n\007heroTid\030\002 \001(\005\022\014\n\004" +
"star\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\"\207\001\n\017TeamOneTea",
"mInfo\0228\n\004team\030\001 \003(\0132*.com.ljsd.jieling.p" +
"rotocols.TeamSimpleInfo\022\024\n\014PokemonInfos\030" +
"\002 \003(\005\022\022\n\ntotalForce\030\003 \001(\005\022\020\n\010remainHp\030\004 " +
"\003(\005\"\271\001\n\013TeamOneInfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005leve" +
"l\030\002 \001(\005\022\014\n\004name\030\003 \001(\t\022\014\n\004head\030\004 \001(\005\022\021\n\th" +
"eadFrame\030\005 \001(\005\022\021\n\tguildName\030\007 \001(\t\0229\n\004tea" +
"m\030\006 \001(\0132+.com.ljsd.jieling.protocols.Tea" +
"mOneTeamInfo\022\021\n\tisApplyed\030\010 \001(\005\"y\n\017Monst" +
"erRankInfo\022\014\n\004name\030\001 \001(\t\022\r\n\005score\030\002 \001(\005\022" +
"\014\n\004rank\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\022\014\n\004head\030\005 \001",
"(\005\022\021\n\theadFrame\030\006 \001(\005\022\013\n\003uid\030\007 \001(\005\"2\n\rHe" +
"roBloodInfo\022\016\n\006heroId\030\001 \001(\t\022\021\n\tlostBlood" +
"\030\002 \001(\005\"D\n\013EndlessInfo\022\r\n\005mapId\030\001 \001(\005\022\022\n\n" +
"worldLevel\030\002 \001(\005\022\022\n\nbloodScore\030\003 \001(\005\"2\n\017" +
"PlayerBindPhone\022\020\n\010phoneNum\030\001 \001(\t\022\r\n\005sta" +
"te\030\002 \001(\005\"3\n\014EndlessPoint\022\020\n\010location\030\001 \001" +
"(\005\022\021\n\tmonsterId\030\002 \001(\005\"2\n\014StrongerInfo\022\020\n" +
"\010curScore\030\001 \001(\005\022\020\n\010maxScore\030\002 \001(\005\"U\n\017Que" +
"stionOptions\022\017\n\007content\030\001 \001(\t\022\014\n\004type\030\002 " +
"\001(\005\022\017\n\007options\030\003 \003(\t\022\022\n\nanswerType\030\004 \001(\005",
"\"\212\001\n\017BloodPersonInfo\022\n\n\002id\030\001 \001(\005\022\014\n\004name" +
"\030\002 \001(\t\022\021\n\theadFrame\030\003 \001(\005\022\014\n\004head\030\004 \001(\005\022" +
"\020\n\010serverId\030\005 \001(\005\022\r\n\005level\030\006 \001(\005\022\014\n\004rank" +
"\030\007 \001(\005\022\r\n\005score\030\010 \001(\005\"H\n\026LuckWheelReward" +
"PosInfo\022\013\n\003pos\030\001 \001(\005\022\016\n\006luckId\030\002 \001(\005\022\021\n\t" +
"luckTimes\030\003 \001(\005\"W\n\013RefreshTask\022\014\n\004type\030\001" +
" \001(\005\022:\n\005tasks\030\002 \003(\0132+.com.ljsd.jieling.p" +
"rotocols.UserMissionInfo\"\221\001\n\021MainLevelRa" +
"nkInfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\022\014\n\004na" +
"me\030\003 \001(\t\022\017\n\007fightId\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022",
"\014\n\004rank\030\006 \001(\005\022\022\n\ntotalForce\030\007 \001(\005\022\021\n\thea" +
"dFrame\030\010 \001(\005\"B\n\017ChampionBetInfo\022\n\n\002id\030\001 " +
"\001(\t\022\020\n\010redCoins\030\002 \001(\005\022\021\n\tblueCoins\030\003 \001(\005" +
"\"\323\001\n\022ChampionBattleInfo\0227\n\006myInfo\030\001 \001(\0132" +
"\'.com.ljsd.jieling.protocols.TeamOneInfo" +
"\022:\n\tenemyInfo\030\002 \001(\0132\'.com.ljsd.jieling.p" +
"rotocols.TeamOneInfo\022\016\n\006result\030\003 \001(\005\0228\n\t" +
"fightData\030\004 \001(\0132%.com.ljsd.jieling.proto" +
"cols.FightData\"\224\001\n\026ChampionBattlePairInf" +
"o\022\022\n\nattackName\030\001 \001(\t\022\017\n\007defName\030\002 \001(\t\022\023",
"\n\013fightResult\030\003 \001(\005\022\n\n\002id\030\004 \001(\t\022\022\n\nround" +
"TImes\030\005 \001(\005\022\016\n\006teamId\030\006 \001(\005\022\020\n\010position\030" +
"\007 \001(\005B\002H\001"
"\025 \001(\005\022\014\n\004ride\030\026 \001(\005\022\021\n\trideLevel\030\027 \001(\005\022\013" +
"\n\003sex\030\030 \001(\005\"*\n\tPrivilege\022\n\n\002id\030\001 \001(\005\022\021\n\t" +
"usedTimes\030\002 \001(\005\"R\n\004Item\022\016\n\006itemId\030\001 \001(\005\022" +
"\017\n\007itemNum\030\002 \001(\005\022\022\n\nendingTime\030\003 \001(\005\022\025\n\r" +
"nextFlushTime\030\004 \001(\005\";\n\016SpecialEffects\022\022\n" +
"\npropertyId\030\001 \001(\005\022\025\n\rpropertyValue\030\002 \001(\005" +
"\"\206\002\n\005Equip\022\n\n\002id\030\001 \001(\t\022\017\n\007equipId\030\002 \001(\005\022",
"A\n\rmainAttribute\030\003 \001(\0132*.com.ljsd.jielin" +
"g.protocols.SpecialEffects\022C\n\017secondAttr" +
"ibute\030\004 \003(\0132*.com.ljsd.jieling.protocols" +
".SpecialEffects\022\024\n\014rebuildLevel\030\005 \001(\005\022\022\n" +
"\ncreateTime\030\006 \001(\005\022\017\n\007skillId\030\007 \001(\005\022\020\n\010is" +
"Locked\030\010 \001(\005\022\013\n\003exp\030\t \001(\005\",\n\007SoulPos\022\017\n\007" +
"equipId\030\001 \001(\t\022\020\n\010position\030\002 \001(\005\"\376\001\n\004Hero" +
"\022\n\n\002id\030\001 \001(\t\022\016\n\006heroId\030\002 \001(\005\022\r\n\005level\030\003 " +
"\001(\005\022\017\n\007breakId\030\004 \001(\005\022\014\n\004star\030\005 \001(\005\022\016\n\006sk" +
"inId\030\006 \001(\005\022\023\n\013equipIdList\030\010 \003(\t\022\022\n\ncreat",
"eTime\030\t \001(\005\022\023\n\013starBreakId\030\n \001(\005\022\025\n\respe" +
"cialEquip\030\013 \003(\t\0224\n\007soulPos\030\014 \003(\0132#.com.l" +
"jsd.jieling.protocols.SoulPos\022\021\n\tlockSta" +
"te\030\r \001(\005\"G\n\rFightUnitInfo\022\016\n\006unitId\030\001 \001(" +
"\t\022\024\n\014unitSkillIds\030\002 \001(\t\022\020\n\010property\030\003 \001(" +
"\t\"\201\001\n\rFightTeamInfo\022@\n\rfightUnitList\030\001 \003" +
"(\0132).com.ljsd.jieling.protocols.FightUni" +
"tInfo\022\025\n\rteamSkillList\030\002 \001(\t\022\027\n\017teamPass" +
"iveList\030\003 \001(\t\"-\n\023EventBehaviorValues\022\026\n\016" +
"behaviorValues\030\001 \003(\005\"y\n\023EventBehaviorCom",
"mon\022\024\n\014behaviorType\030\001 \001(\005\022L\n\023eventBehavi" +
"orValues\030\002 \003(\0132/.com.ljsd.jieling.protoc" +
"ols.EventBehaviorValues\"=\n\004Cell\022\016\n\006cellI" +
"d\030\001 \001(\005\022\017\n\007pointId\030\002 \001(\005\022\024\n\014monsterForce" +
"\030\003 \001(\005\"^\n\007Mission\022\016\n\006itemId\030\001 \001(\005\022\r\n\005sta" +
"te\030\002 \001(\t\022\023\n\013missionStep\030\003 \001(\005\022\014\n\004time\030\004 " +
"\001(\005\022\021\n\tdeadTimes\030\005 \001(\005\"\243\001\n\004Mail\022\016\n\006mailI" +
"d\030\001 \001(\t\022\r\n\005state\030\002 \001(\005\022\014\n\004head\030\003 \001(\t\022\017\n\007" +
"content\030\004 \001(\t\022\020\n\010mailItem\030\005 \001(\t\022\020\n\010sendT" +
"ime\030\006 \001(\005\022\025\n\reffectiveTime\030\007 \001(\005\022\020\n\010send",
"Name\030\010 \001(\t\022\020\n\010mailType\030\t \001(\005\"\220\002\n\004Drop\0222\n" +
"\010itemlist\030\001 \003(\0132 .com.ljsd.jieling.proto" +
"cols.Item\0222\n\007equipId\030\002 \003(\0132!.com.ljsd.ji" +
"eling.protocols.Equip\022.\n\004Hero\030\003 \003(\0132 .co" +
"m.ljsd.jieling.protocols.Hero\022:\n\017especia" +
"lEquipId\030\004 \003(\0132!.com.ljsd.jieling.protoc" +
"ols.Equip\0224\n\tsoulEquip\030\005 \003(\0132!.com.ljsd." +
"jieling.protocols.Equip\"\034\n\tGMCommand\022\017\n\007" +
"command\030\001 \001(\t\"0\n\014TeamHeroInfo\022\020\n\010positio" +
"n\030\001 \001(\005\022\016\n\006heroId\030\002 \001(\t\"6\n\017TeamPokemonIn",
"fo\022\020\n\010position\030\001 \001(\005\022\021\n\tpokemonId\030\002 \001(\005\"" +
"\267\001\n\013TeamPosInfo\022\016\n\006teamId\030\001 \001(\005\022\020\n\010teamN" +
"ame\030\002 \001(\t\022?\n\rteamHeroInfos\030\003 \003(\0132(.com.l" +
"jsd.jieling.protocols.TeamHeroInfo\022E\n\020te" +
"amPokemonInfos\030\004 \003(\0132+.com.ljsd.jieling." +
"protocols.TeamPokemonInfo\"-\n\020Pokemoncomo" +
"npent\022\n\n\002id\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\"p\n\013Poke" +
"monInfo\022\n\n\002id\030\001 \001(\005\022\r\n\005stage\030\002 \001(\005\022F\n\020po" +
"kemoncomonpent\030\003 \003(\0132,.com.ljsd.jieling." +
"protocols.Pokemoncomonpent\">\n\014RingFireIn",
"fo\022\n\n\002id\030\001 \001(\005\022\r\n\005stage\030\002 \001(\005\022\023\n\013comonpe" +
"ntId\030\003 \003(\005\"<\n\020WorkShopBaseInfo\022\014\n\004type\030\001" +
" \001(\005\022\r\n\005levle\030\002 \001(\005\022\013\n\003exp\030\003 \001(\005\".\n\022Work" +
"ShopUnLockInfo\022\014\n\004type\030\001 \001(\005\022\n\n\002id\030\004 \003(\005" +
"\"\312\001\n\tFightData\022A\n\016heroFightInfos\030\001 \001(\0132)" +
".com.ljsd.jieling.protocols.FightTeamInf" +
"o\022>\n\013monsterList\030\002 \003(\0132).com.ljsd.jielin" +
"g.protocols.FightTeamInfo\022\021\n\tfightSeed\030\003" +
" \001(\005\022\024\n\014fightMaxTime\030\004 \001(\005\022\021\n\tfightType\030" +
"\005 \001(\005\"-\n\rExploreDetail\022\n\n\002id\030\001 \001(\005\022\020\n\010pr",
"ogress\030\002 \001(\005\"0\n\nFoodBuffer\022\020\n\010bufferId\030\001" +
" \001(\005\022\020\n\010leftStep\030\002 \001(\005\"/\n\023NewPlayerGuide" +
"Point\022\014\n\004type\030\001 \001(\005\022\n\n\002id\030\002 \001(\005\"L\n\017Level" +
"Difficulty\022\017\n\007fightId\030\001 \001(\005\022\r\n\005state\030\002 \001" +
"(\005\022\013\n\003num\030\003 \001(\005\022\014\n\004type\030\004 \001(\005\"l\n\024LevelDi" +
"fficultyInfos\022\016\n\006areaId\030\001 \001(\005\022D\n\017LevelDi" +
"fficulty\030\002 \003(\0132+.com.ljsd.jieling.protoc" +
"ols.LevelDifficulty\":\n\007MapInfo\022\r\n\005mapId\030" +
"\001 \001(\005\022\021\n\tleastTime\030\002 \001(\005\022\r\n\005stars\030\003 \003(\005\"" +
"\363\001\n\014ActivityInfo\022\022\n\nactivityId\030\001 \002(\005\022E\n\007",
"mission\030\002 \003(\01324.com.ljsd.jieling.protoco" +
"ls.ActivityInfo.MissionInfo\022\r\n\005value\030\006 \001" +
"(\005\022\021\n\tstartTime\030\005 \001(\005\022\017\n\007endTime\030\003 \001(\005\022\022" +
"\n\nreallyOpen\030\004 \001(\005\032A\n\013MissionInfo\022\021\n\tmis" +
"sionId\030\001 \002(\005\022\020\n\010progress\030\002 \002(\005\022\r\n\005state\030" +
"\003 \002(\005\"J\n\nGmResponse\022.\n\004drop\030\001 \001(\0132 .com." +
"ljsd.jieling.protocols.Drop\022\014\n\004info\030\002 \001(" +
"\t\"\215\001\n\017ArenaPersonInfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005le" +
"vel\030\002 \001(\005\022\014\n\004name\030\003 \001(\t\022\r\n\005score\030\004 \001(\005\022\014" +
"\n\004head\030\005 \001(\005\022\014\n\004rank\030\006 \001(\005\022\022\n\ntotalForce",
"\030\007 \001(\005\022\021\n\theadFrame\030\010 \001(\005\"\027\n\004Team\022\017\n\007her" +
"oTid\030\001 \003(\005\"}\n\nArenaEnemy\022?\n\npersonInfo\030\001" +
" \001(\0132+.com.ljsd.jieling.protocols.ArenaP" +
"ersonInfo\022.\n\004team\030\002 \001(\0132 .com.ljsd.jieli" +
"ng.protocols.Team\"~\n\tArenaInfo\022\020\n\010failNu" +
"ms\030\001 \001(\005\022\023\n\013successNums\030\002 \001(\005\022\r\n\005score\030\003" +
" \001(\005\022;\n\013arenaEnemys\030\004 \003(\0132&.com.ljsd.jie" +
"ling.protocols.ArenaEnemy\"\'\n\tStoreItem\022\n" +
"\n\002id\030\001 \001(\005\022\016\n\006buyNum\030\002 \001(\005\"\216\001\n\tStoreInfo" +
"\022\n\n\002id\030\001 \001(\005\022\027\n\017lastRefreshTime\030\002 \001(\003\022\021\n",
"\tstartTime\030\004 \001(\003\022\017\n\007endTime\030\005 \001(\003\0228\n\tsto" +
"reItem\030\006 \003(\0132%.com.ljsd.jieling.protocol" +
"s.StoreItem\"\236\001\n\017ArenaRecordInfo\022\n\n\002id\030\001 " +
"\001(\t\022?\n\nattackInfo\030\002 \001(\0132+.com.ljsd.jieli" +
"ng.protocols.ArenaPersonInfo\022\022\n\nattackTi" +
"me\030\003 \001(\005\022\025\n\rmyScoreChange\030\004 \001(\005\022\023\n\013fight" +
"Result\030\005 \001(\005\"Z\n\016FunctionOfTime\022\022\n\nfuncti" +
"onId\030\001 \001(\005\022\021\n\tstartTime\030\002 \001(\005\022\017\n\007endTime" +
"\030\003 \001(\005\022\020\n\010interval\030\004 \001(\005\"~\n\025AdventureRan" +
"kItemInfo\022\r\n\005level\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\014",
"\n\004hurt\030\003 \001(\005\022\014\n\004head\030\004 \001(\005\022\014\n\004rank\030\005 \001(\005" +
"\022\021\n\theadFrame\030\006 \001(\005\022\013\n\003uid\030\007 \001(\005\"\313\001\n\021Adv" +
"entureBossInfo\022\017\n\007arenaId\030\001 \001(\005\022\017\n\007findU" +
"id\030\002 \001(\005\022\020\n\010findName\030\003 \001(\t\022\016\n\006bossId\030\004 \001" +
"(\t\022\023\n\013bossGroupId\030\005 \001(\005\022\016\n\006myHurt\030\006 \001(\005\022" +
"\021\n\tlevelTime\030\007 \001(\005\022\017\n\007totalHp\030\010 \001(\005\022\025\n\rb" +
"ossRemainlHp\030\t \001(\005\022\022\n\narenaLevel\030\n \001(\005\"v" +
"\n\017UserMissionInfo\022\021\n\tmissionId\030\001 \001(\005\022\020\n\010" +
"progress\030\002 \001(\005\022\r\n\005state\030\003 \001(\005\022\014\n\004type\030\004 " +
"\001(\005\022\021\n\ttakeTimes\030\005 \001(\005\022\016\n\006heroId\030\006 \003(\t\"8",
"\n\013VipBaseInfo\022\020\n\010vipLevel\030\001 \001(\005\022\027\n\017hadTa" +
"keLevelBox\030\002 \001(\005\"\250\001\n\006Friend\022\n\n\002id\030\001 \001(\005\022" +
"\014\n\004name\030\002 \001(\t\022\n\n\002lv\030\003 \001(\005\022\023\n\013offLineTime" +
"\030\004 \001(\004\022\022\n\nhaveReward\030\005 \001(\005\022\016\n\006isGive\030\006 \001" +
"(\005\022\021\n\tisApplyed\030\007 \001(\005\022\014\n\004head\030\014 \001(\005\022\r\n\005f" +
"rame\030\r \001(\005\022\017\n\007soulVal\030\016 \001(\005\"V\n\rGiftGoods" +
"Info\022\017\n\007goodsId\030\001 \001(\005\022\020\n\010buyTimes\030\002 \001(\005\022" +
"\021\n\tstartTime\030\003 \001(\005\022\017\n\007endTime\030\004 \001(\005\"7\n\021G" +
"oodsTypeDuration\022\021\n\tgoodsType\030\001 \001(\005\022\017\n\007e" +
"ndTime\030\002 \001(\005\"/\n\016TechnologyInfo\022\016\n\006techId",
"\030\001 \001(\005\022\r\n\005levle\030\002 \001(\005\"J\n\020SuddenlyBossInf" +
"o\022\022\n\nsuddBossId\030\006 \001(\005\022\017\n\007endTime\030\007 \001(\005\022\021" +
"\n\tfindMapId\030\010 \001(\005\"H\n\010ItemInfo\022\022\n\ntemplat" +
"eId\030\001 \001(\005\022\017\n\007overlap\030\002 \001(\005\022\027\n\017nextRefres" +
"hTime\030\003 \001(\005\"H\n\010RankInfo\022\014\n\004rank\030\001 \001(\005\022\016\n" +
"\006param1\030\002 \001(\005\022\016\n\006param2\030\003 \001(\005\022\016\n\006param3\030" +
"\004 \001(\005\"\263\001\n\010UserRank\022\013\n\003uid\030\001 \001(\005\022\r\n\005level" +
"\030\002 \001(\005\022\014\n\004head\030\003 \001(\005\022\020\n\010userName\030\004 \001(\t\0226" +
"\n\010rankInfo\030\005 \001(\0132$.com.ljsd.jieling.prot" +
"ocols.RankInfo\022\021\n\theadFrame\030\006 \001(\005\022\021\n\tgui",
"ldName\030\007 \001(\t\022\r\n\005force\030\010 \001(\005\"\204\001\n\025ActorEff" +
"ectBufferInfo\022\n\n\002id\030\001 \001(\005\022\014\n\004type\030\002 \001(\005\022" +
"\021\n\tstartTime\030\003 \001(\005\022\017\n\007endTime\030\004 \001(\005\022\016\n\006t" +
"arget\030\005 \001(\005\022\016\n\006caster\030\006 \001(\005\022\r\n\005value\030\007 \003" +
"(\005\"T\n\016BloodyHeroInfo\022\016\n\006heroId\030\001 \001(\t\022\016\n\006" +
"heroHp\030\002 \001(\005\022\021\n\theroMaxHp\030\003 \001(\005\022\017\n\007heroT" +
"id\030\004 \001(\005\"%\n\010SceneMsg\022\014\n\004time\030\001 \001(\005\022\013\n\003ms" +
"g\030\002 \001(\t\"\'\n\nPosMineral\022\013\n\003pos\030\001 \001(\005\022\014\n\004nu" +
"ms\030\002 \001(\005\"\264\001\n\010Creature\022\014\n\004path\030\001 \003(\005\022\r\n\005s" +
"peed\030\002 \001(\005\022\r\n\005maxHp\030\003 \001(\005\022\r\n\005curHp\030\004 \001(\005",
"\022\017\n\007mineral\030\005 \001(\005\022\014\n\004camp\030\006 \001(\005\022<\n\010heroI" +
"nfo\030\007 \003(\0132*.com.ljsd.jieling.protocols.B" +
"loodyHeroInfo\022\020\n\010killNums\030\010 \001(\005\"\217\001\n\nScen" +
"eActor\022\n\n\002id\030\001 \001(\005\022\016\n\006curPos\030\002 \001(\005\022\r\n\005st" +
"ate\030\003 \001(\005\022\014\n\004type\030\004 \001(\005\0226\n\010Creature\030\006 \001(" +
"\0132$.com.ljsd.jieling.protocols.Creature\022" +
"\020\n\010userName\030\007 \001(\t\"\236\002\n\tSceneInfo\022\016\n\006roomI" +
"d\030\001 \001(\005\022\r\n\005mapId\030\002 \001(\005\022:\n\nSceneActor\030\003 \003" +
"(\0132&.com.ljsd.jieling.protocols.SceneAct" +
"or\022P\n\025actorEffectBufferInfo\030\004 \003(\01321.com.",
"ljsd.jieling.protocols.ActorEffectBuffer" +
"Info\022\024\n\014barrierPoint\030\005 \003(\005\022:\n\nposMineral" +
"\030\006 \003(\0132&.com.ljsd.jieling.protocols.PosM" +
"ineral\022\022\n\nremainTime\030\007 \001(\005\"S\n\027SceneGetFu" +
"llMsgResponse\0228\n\tsceneInfo\030\001 \001(\0132%.com.l" +
"jsd.jieling.protocols.SceneInfo\"B\n\013bless" +
"Reward\022\022\n\nlocationId\030\001 \001(\005\022\r\n\005state\030\002 \001(" +
"\005\022\020\n\010rewardId\030\003 \001(\005\"5\n\022fiveResetTowerInf" +
"o\022\r\n\005tower\030\001 \001(\005\022\020\n\010intoType\030\002 \001(\005\";\n\020Fa" +
"milyContribute\022\013\n\003win\030\001 \001(\005\022\014\n\004draw\030\002 \001(",
"\005\022\014\n\004fail\030\003 \001(\005\"\210\002\n\016FamilyBaseInfo\022\n\n\002id" +
"\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\017\n\007annouce\030\003 \001(\t\022\r\n" +
"\005levle\030\004 \001(\005\022\013\n\003exp\030\005 \001(\005\022\020\n\010totalNum\030\006 " +
"\001(\005\022\016\n\006maxNum\030\007 \001(\005\022\020\n\010joinType\030\010 \001(\005\022\014\n" +
"\004icon\030\t \001(\005\022\021\n\tlevelTime\030\n \001(\005\022A\n\013fightR" +
"esult\030\013 \001(\0132,.com.ljsd.jieling.protocols" +
".FamilyContribute\022\027\n\017playerIntoLevel\030\014 \001" +
"(\005\")\n\013endlessHero\022\016\n\006heroId\030\001 \001(\t\022\n\n\002hp\030" +
"\002 \001(\005\"2\n\022EndlessRefreshInfo\022\016\n\006cellId\030\001 " +
"\001(\005\022\014\n\004time\030\002 \001(\005\"u\n\014UseForceInfo\022\014\n\004nam",
"e\030\001 \001(\t\022\014\n\004leve\030\002 \001(\005\022\r\n\005force\030\003 \001(\005\022\014\n\004" +
"rank\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 " +
"\001(\005\022\013\n\003uid\030\007 \001(\005\"H\n\013endlessSign\022\r\n\005mapId" +
"\030\001 \001(\005\022\016\n\006cellId\030\002 \001(\005\022\014\n\004info\030\003 \001(\t\022\014\n\004" +
"type\030\004 \001(\005\"g\n\nExpertInfo\022\014\n\004name\030\001 \001(\t\022\r" +
"\n\005score\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\022\r\n\005level\030\004 \001" +
"(\005\022\014\n\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\")\n\nS" +
"ignInInfo\022\014\n\004days\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\"N" +
"\n\016TeamSimpleInfo\022\016\n\006heroid\030\001 \001(\t\022\017\n\007hero" +
"Tid\030\002 \001(\005\022\014\n\004star\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\"\207",
"\001\n\017TeamOneTeamInfo\0228\n\004team\030\001 \003(\0132*.com.l" +
"jsd.jieling.protocols.TeamSimpleInfo\022\024\n\014" +
"PokemonInfos\030\002 \003(\005\022\022\n\ntotalForce\030\003 \001(\005\022\020" +
"\n\010remainHp\030\004 \003(\005\"\271\001\n\013TeamOneInfo\022\013\n\003uid\030" +
"\001 \001(\005\022\r\n\005level\030\002 \001(\005\022\014\n\004name\030\003 \001(\t\022\014\n\004he" +
"ad\030\004 \001(\005\022\021\n\theadFrame\030\005 \001(\005\022\021\n\tguildName" +
"\030\007 \001(\t\0229\n\004team\030\006 \001(\0132+.com.ljsd.jieling." +
"protocols.TeamOneTeamInfo\022\021\n\tisApplyed\030\010" +
" \001(\005\"y\n\017MonsterRankInfo\022\014\n\004name\030\001 \001(\t\022\r\n" +
"\005score\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\022\r\n\005level\030\004 \001(",
"\005\022\014\n\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\022\013\n\003ui" +
"d\030\007 \001(\005\"2\n\rHeroBloodInfo\022\016\n\006heroId\030\001 \001(\t" +
"\022\021\n\tlostBlood\030\002 \001(\005\"D\n\013EndlessInfo\022\r\n\005ma" +
"pId\030\001 \001(\005\022\022\n\nworldLevel\030\002 \001(\005\022\022\n\nbloodSc" +
"ore\030\003 \001(\005\"2\n\017PlayerBindPhone\022\020\n\010phoneNum" +
"\030\001 \001(\t\022\r\n\005state\030\002 \001(\005\"3\n\014EndlessPoint\022\020\n" +
"\010location\030\001 \001(\005\022\021\n\tmonsterId\030\002 \001(\005\"2\n\014St" +
"rongerInfo\022\020\n\010curScore\030\001 \001(\005\022\020\n\010maxScore" +
"\030\002 \001(\005\"U\n\017QuestionOptions\022\017\n\007content\030\001 \001" +
"(\t\022\014\n\004type\030\002 \001(\005\022\017\n\007options\030\003 \003(\t\022\022\n\nans",
"werType\030\004 \001(\005\"\212\001\n\017BloodPersonInfo\022\n\n\002id\030" +
"\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\021\n\theadFrame\030\003 \001(\005\022\014" +
"\n\004head\030\004 \001(\005\022\020\n\010serverId\030\005 \001(\005\022\r\n\005level\030" +
"\006 \001(\005\022\014\n\004rank\030\007 \001(\005\022\r\n\005score\030\010 \001(\005\"H\n\026Lu" +
"ckWheelRewardPosInfo\022\013\n\003pos\030\001 \001(\005\022\016\n\006luc" +
"kId\030\002 \001(\005\022\021\n\tluckTimes\030\003 \001(\005\"W\n\013RefreshT" +
"ask\022\014\n\004type\030\001 \001(\005\022:\n\005tasks\030\002 \003(\0132+.com.l" +
"jsd.jieling.protocols.UserMissionInfo\"\221\001" +
"\n\021MainLevelRankInfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005leve" +
"l\030\002 \001(\005\022\014\n\004name\030\003 \001(\t\022\017\n\007fightId\030\004 \001(\005\022\014",
"\n\004head\030\005 \001(\005\022\014\n\004rank\030\006 \001(\005\022\022\n\ntotalForce" +
"\030\007 \001(\005\022\021\n\theadFrame\030\010 \001(\005\"B\n\017ChampionBet" +
"Info\022\n\n\002id\030\001 \001(\t\022\020\n\010redCoins\030\002 \001(\005\022\021\n\tbl" +
"ueCoins\030\003 \001(\005\"\323\001\n\022ChampionBattleInfo\0227\n\006" +
"myInfo\030\001 \001(\0132\'.com.ljsd.jieling.protocol" +
"s.TeamOneInfo\022:\n\tenemyInfo\030\002 \001(\0132\'.com.l" +
"jsd.jieling.protocols.TeamOneInfo\022\016\n\006res" +
"ult\030\003 \001(\005\0228\n\tfightData\030\004 \001(\0132%.com.ljsd." +
"jieling.protocols.FightData\"\245\001\n\026Champion" +
"BattlePairInfo\022\022\n\nattackName\030\001 \001(\t\022\017\n\007de",
"fName\030\002 \001(\t\022\023\n\013fightResult\030\003 \001(\005\022\n\n\002id\030\004" +
" \001(\t\022\022\n\nroundTImes\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(\005B\002H\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -82908,7 +83134,7 @@ public final class CommonProto {
internal_static_com_ljsd_jieling_protocols_Player_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_Player_descriptor,
new java.lang.String[] { "Uid", "NickName", "Level", "Exp", "VipLevel", "FamilyId", "Head", "CurMapId", "Energy", "LastUpdateEnergyTime", "ServerTime", "MaxForce", "SaveAmt", "RechargeTime", "IsFirstRecharge", "IsMatchRoom", "CurRoomType", "HeadFrame", "RoomAddreess", "Designation", "Decrotion", "Ride", "RideLevel", });
new java.lang.String[] { "Uid", "NickName", "Level", "Exp", "VipLevel", "FamilyId", "Head", "CurMapId", "Energy", "LastUpdateEnergyTime", "ServerTime", "MaxForce", "SaveAmt", "RechargeTime", "IsFirstRecharge", "IsMatchRoom", "CurRoomType", "HeadFrame", "RoomAddreess", "Designation", "Decrotion", "Ride", "RideLevel", "Sex", });
internal_static_com_ljsd_jieling_protocols_Privilege_descriptor =
getDescriptor().getMessageTypes().get(2);
internal_static_com_ljsd_jieling_protocols_Privilege_fieldAccessorTable = new
@ -83436,7 +83662,7 @@ public final class CommonProto {
internal_static_com_ljsd_jieling_protocols_ChampionBattlePairInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_ChampionBattlePairInfo_descriptor,
new java.lang.String[] { "AttackName", "DefName", "FightResult", "Id", "RoundTImes", "TeamId", "Position", });
new java.lang.String[] { "AttackName", "DefName", "FightResult", "Id", "RoundTImes", "TeamId", "Position", "IsGUess", });
return null;
}
};

View File

@ -232,7 +232,7 @@ public class HandlerLogicThread extends Thread{
return true;
}
SGlobalSystemConfig sGlobalSystemConfig = sGlobalSystemConfigMap.get(enumByProto.getFunctionId());
return !checkOpen(user,sGlobalSystemConfig);
return checkOpen(user,sGlobalSystemConfig);
} catch (Exception e) {
e.printStackTrace();
}
@ -250,18 +250,18 @@ public class HandlerLogicThread extends Thread{
int condition = sGlobalSystemConfig.getOpenRules()[1];
if (type ==1){
if (!SMainLevelConfig.biggerThanFight(mainLevelManager.getFightId(),condition)) {
return true;
return false;
}
}else if(type == 2){
if (level < condition){
return true;
return false;
}
}else if(type == 3){ //工坊
if (workShopLevel < condition){
return true;
return false;
}
}
return false;
return true;
}

View File

@ -63,6 +63,8 @@ public class ActivityLogic {
}
//更新每日充值
ActivityLogic.getInstance().resumeActivity(user, ActivityType.DAILY_RECHARGE);
//更新每日累计充值
ActivityLogic.getInstance().resumeActivity(user, ActivityType.RECHARGE_NUM);
//更新首日充值
user.getPlayerInfoManager().getRechargeInfo().setDailyFirst(0);
//更新累计充值天数
@ -82,6 +84,7 @@ public class ActivityLogic {
upFiveActivityTypes.add(ActivityType.DAILY_RECHARGE);
upFiveActivityTypes.add(ActivityType.LUCK_WHEEL);
upFiveActivityTypes.add(ActivityType.LUCK_WHEEL_ADVANCE);
upFiveActivityTypes.add(ActivityType.RECHARGE_NUM);
upFivePlayerActivity(user, upFiveActivityTypes, fBuilder);

View File

@ -1,5 +1,7 @@
package com.ljsd.jieling.logic.activity;
import com.ljsd.jieling.logic.OnlineUserManager;
import com.ljsd.jieling.logic.dao.root.User;
import config.SActivityRewardConfig;
import com.ljsd.jieling.logic.dao.ActivityMission;
import com.ljsd.jieling.logic.dao.ActivityProgressInfo;
@ -10,6 +12,14 @@ import com.ljsd.jieling.network.session.ISession;
*/
class RechargeSumActivity extends AbstractActivity {
@Override
public void onResume(User user) throws Exception {
//补发前日未领取的奖
ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId());
takeAllReward(sessionByUid);
super.onResume(user);
}
public RechargeSumActivity(int id) {
super(id);
}

View File

@ -23,7 +23,6 @@ import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.fight.*;
import com.ljsd.jieling.logic.hero.HeroLogic;
import com.ljsd.jieling.logic.mail.MailLogic;
import com.ljsd.jieling.logic.mission.event.MissionEventDistributor;
import com.ljsd.jieling.logic.player.PlayerLogic;
import com.ljsd.jieling.network.server.ProtocolsManager;
import com.ljsd.jieling.network.session.ISession;
@ -49,8 +48,6 @@ public class ChampionshipLogic {
//启动服务器应该去redis获取
private static int progress = -1; //阶段
private static Gson gson = new Gson();
private static int roundTimes; //比赛进行第几轮
private static int endTime;
@ -71,7 +68,7 @@ public class ChampionshipLogic {
}.getType();
Map<Integer, List<Integer>> finalmemberOfTeam = RedisUtil.getInstence().getMapValues(RedisKey.CHAMPION_FINAL_TEAM_INFO, "", Integer.class, valueType);
Map<Integer, Integer> memberPerOfTeam = new HashMap<>();
List<String> arenaRecodeds = new ArrayList<>();
List<String> arenaRecodeds =null;
if(type == 1){
arenaRecodeds = RedisUtil.getInstence().lGet(RedisKey.CHAMPION_FINAL32_JOIN_IDS, "", 0, -1);
finalmemberOfTeam.forEach((k,v)->{
@ -82,12 +79,11 @@ public class ChampionshipLogic {
}else{
arenaRecodeds = RedisUtil.getInstence().lGet(RedisKey.CHAMPION_FINAL4_JOIN_IDS, "", 0, -1);
}
SChampionshipSetting sChampionshipSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getsChampionshipSetting();
List<Object> arenaIds = new ArrayList<>(arenaRecodeds);
List<ArenaRecord> arenaRecords = RedisUtil.getInstence().getMapEntrys(RedisKey.CHAMPION_ARENA_RECORD, "", arenaIds, ArenaRecord.class);
Map<Integer, SArenaRobotConfig> config = STableManager.getConfig(SArenaRobotConfig.class);
List<String> curArenaRecordIds = RedisUtil.getInstence().lGet(RedisKey.CHAMPION_CUR_JOIN_IDS, "", 0, -1);
ArenaInfoProto.ChampionViewFinalResponse.Builder builder = ArenaInfoProto.ChampionViewFinalResponse.newBuilder();
String selectIdForRedis = getSelectIdForRedis();
for (ArenaRecord arenaRecord : arenaRecords) {
int attackId = arenaRecord.getAttackId();
int defUid = arenaRecord.getDefUid();
@ -104,6 +100,10 @@ public class ChampionshipLogic {
if(type == 1){
teamId = memberPerOfTeam.get(attackId) +1;
}
int isGuess = 0;
if(arenaRecord.getId().equals(selectIdForRedis)){
isGuess = 1;
}
builder.addChampionBattlePairInfo(CommonProto.ChampionBattlePairInfo.newBuilder()
.setAttackName(attackName)
@ -112,6 +112,7 @@ public class ChampionshipLogic {
.setRoundTImes(arenaRecord.getRoundTims())
.setTeamId(teamId)
.setId(arenaRecord.getId())
.setIsGUess(isGuess)
.setPosition(arenaRecord.getNums()+1)
);
}
@ -376,22 +377,23 @@ public class ChampionshipLogic {
for(int i=1;i<8;i++){
roundTimes=i;
selectToBattle();
switchBet(47);
switchBet(57);
scoreToRedis();
}
selectToJoinFinal();
schedule=2;
for(int i=8;i<13;i++){
roundTimes=i;
selectToBattle();
switchBet(47);
switchBet(57);
scoreToRedis();
}
close();
// close();
}
@ -404,6 +406,7 @@ public class ChampionshipLogic {
* @return
*/
private static List<List<Integer>> getMemberOfTeamOfGroup(List<MemberInfo> memberInfoList,int groupNums,boolean teamUpdate){
Collections.shuffle(memberInfoList);
int index=0;
List<List<Integer>> memberOfTeamTmp = new ArrayList<>();
@ -445,6 +448,7 @@ public class ChampionshipLogic {
Object latestKey = RedisUtil.getInstence().lGetIndex(key, -1);
ArenaRecord arenaRecord = RedisUtil.getInstence().getMapValue(RedisKey.CHAMPION_ARENA_RECORD, "", latestKey.toString(), ArenaRecord.class);
int enemyId = arenaRecord.getDefUid();
int attackId = arenaRecord.getAttackId();
int fightResult = arenaRecord.getFightResult();
CommonProto.ChampionBattleInfo.Builder builder1 = CommonProto.ChampionBattleInfo.newBuilder();
if(roundTimes == arenaRecord.getRoundTims() && (progress%10%4 != 3 || fightResult==-2)){
@ -454,7 +458,7 @@ public class ChampionshipLogic {
builder1.setFightData( CommonProto.FightData.parseFrom(arenaRecord.getFightData()));
}
builder.setChampionBattleInfo(builder1
.setMyInfo(getChampionBattleInfo(uid))
.setMyInfo(getChampionBattleInfo(attackId))
.setEnemyInfo(getChampionBattleInfo(enemyId))
.setResult(fightResult)
.build());
@ -568,10 +572,18 @@ public class ChampionshipLogic {
ArenaInfoProto.ChampionGetWorldRankResponse.Builder builder = ArenaInfoProto.ChampionGetWorldRankResponse.newBuilder();
List<CommonProto.ArenaEnemy> arenaRankMemberInfo = new ArrayList<>(8);
Map<Integer,Integer> uidRankMap = new HashMap<>();
for(int uidTmp : memberIds){
int score = getJoinMemberInfo(uidTmp).getScore();
uidRankMap.put(uidTmp,score);
}
Set<ZSetOperations.TypedTuple<String>> arenaRankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.CHAMPION_RANK,"", 0, -1);
arenaRankInfo.forEach(item->{
String value = item.getValue();
int uidTmp = Integer.parseInt(value);
if(memberIds.contains(uidTmp)){
int score = item.getScore().intValue();
if(score>=100){
score = getJoinMemberInfo(uidTmp).getScore();
}
uidRankMap.put(uidTmp,score);
}
});
//这里将map.entrySet()转换成list
List<Map.Entry<Integer,Integer>> list = new ArrayList<Map.Entry<Integer,Integer>>(uidRankMap.entrySet());
@ -602,6 +614,7 @@ public class ChampionshipLogic {
List<ArenaRecord> myArenaRecordInfos = RedisUtil.getInstence().getMapEntrys(RedisKey.CHAMPION_ARENA_RECORD, "", ids, ArenaRecord.class);
Map<Integer, SArenaRobotConfig> robotConfigMap = STableManager.getConfig(SArenaRobotConfig.class);
for(ArenaRecord arenaRecord : myArenaRecordInfos){
int attackUid = arenaRecord.getAttackId();
int enemyId = arenaRecord.getDefUid();
int fightResult = arenaRecord.getFightResult();
if(roundTimes == arenaRecord.getRoundTims()){
@ -613,8 +626,13 @@ public class ChampionshipLogic {
fightResult =-1;
}
int enemyType = robotConfigMap.containsKey(enemyId)?0:1;
int attackType = robotConfigMap.containsKey(attackUid)?0:1;
CommonProto.ArenaEnemy arenaEnemy = ArenaLogic.getInstance().getArenaEnemy(enemyId, enemyType);
ArenaInfoProto.ChampionTwoEnemInfo build = ArenaInfoProto.ChampionTwoEnemInfo.newBuilder().setBlueEnemy(arenaEnemy).setRoundTimes(arenaRecord.getRoundTims())
CommonProto.ArenaEnemy attackInfo = ArenaLogic.getInstance().getArenaEnemy(attackUid, attackType);
ArenaInfoProto.ChampionTwoEnemInfo build = ArenaInfoProto.ChampionTwoEnemInfo.newBuilder()
.setBlueEnemy(attackInfo)
.setRedEnemy(arenaEnemy)
.setRoundTimes(arenaRecord.getRoundTims())
.setFightResult(fightResult)
.setId(arenaRecord.getId())
.build();
@ -842,11 +860,11 @@ public class ChampionshipLogic {
int fightResult = arenaRecord.getFightResult();
int winUid = arenaRecord.getDefUid();
int failUid = arenaRecord.getAttackId();
if(fightResult == 1){
winUid = arenaRecord.getAttackId();
failUid = arenaRecord.getDefUid();
int winUid = arenaRecord.getAttackId();
int failUid = arenaRecord.getDefUid();
if(fightResult == 0){
winUid = arenaRecord.getDefUid();
failUid = arenaRecord.getAttackId();
}
Double winCoins = RedisUtil.getInstence().getZSetScore(RedisKey.CHAMPION_BET_ALL, "", selectUid + ":" +winUid);
Double failCoins = RedisUtil.getInstence().getZSetScore(RedisKey.CHAMPION_BET_ALL, "", selectUid + ":" + failUid);
@ -866,6 +884,12 @@ public class ChampionshipLogic {
drop[0][1] = mineWinCoins;
ItemUtil.drop(user, drop, BIReason.CHAMPIION_BET_WIN_REWARD);
MongoUtil.getLjsdMongoTemplate().lastUpdate();
ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId());
if(sessionByUid!=null){
ArenaInfoProto.ChampionGuessSuccessIndication build = ArenaInfoProto.ChampionGuessSuccessIndication.newBuilder().setItemId(arenaItem[0]).setItemNum(mineWinCoins).setRoundTimes(roundTimes).build();
MessageUtil.sendIndicationMessage(sessionByUid,1, MessageTypeProto.MessageType.CHAMPION_GUESS_SUCCESS_INDICATION_VALUE,build,true);
}
}
});
ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker);
@ -917,22 +941,22 @@ public class ChampionshipLogic {
int myWinCoins =0;
if(fightResult>=0){
int winner = arenaRecord.getAttackId();
int loseer = arenaRecord .getDefUid();
int loseer = arenaRecord .getDefUid();
if(fightResult == 0){
winner = arenaRecord.getDefUid();
loseer = arenaRecord.getAttackId();
}
if(!StringUtil.isEmpty(guessUid) && guessUid.equals(winner)){
if(!StringUtil.isEmpty(guessUid) && Integer.parseInt(guessUid)== winner){
guessState = 2;
Double winnerCoins = RedisUtil.getInstence().getZSetScore(RedisKey.CHAMPION_BET_ALL, "", arenaRecord.getId() + ":" + winner);
Double loseCoins = RedisUtil.getInstence().getZSetScore(RedisKey.CHAMPION_BET_ALL, "", arenaRecord.getId() + ":" + loseer);
myWinCoins = (int)(winnerCoins/(winnerCoins+loseCoins)*mineBetCoins);
myWinCoins = (int)((winnerCoins+loseCoins)/winnerCoins*mineBetCoins);
}
}
builder.addChampionMyBetDetails(betDetailBuilder.setBetResult(guessState)
.setEnemyPairInfo(ArenaInfoProto.ChampionTwoEnemInfo.newBuilder().setRedEnemy(attackEnemy).setBlueEnemy(defEnemy).setFightResult(fightResult).setId(arenaRecord.getId()).setRoundTimes(arenaRecord.getRoundTims()))
.setEnemyPairInfo(ArenaInfoProto.ChampionTwoEnemInfo.newBuilder().setRedEnemy(defEnemy).setBlueEnemy(attackEnemy).setFightResult(fightResult).setId(arenaRecord.getId()).setRoundTimes(arenaRecord.getRoundTims()))
.setMyBetCoins(mineBetCoins)
.setMyWinCoins(myWinCoins)
@ -951,7 +975,7 @@ public class ChampionshipLogic {
ArenaRecord arenaRecord = RedisUtil.getInstence().getMapValue(RedisKey.CHAMPION_ARENA_RECORD,"",selectUid,ArenaRecord.class);
Double attackCoins = RedisUtil.getInstence().getZSetScore(RedisKey.CHAMPION_BET_ALL, "", selectUid + ":" + arenaRecord.getAttackId());
Double defCoins = RedisUtil.getInstence().getZSetScore(RedisKey.CHAMPION_BET_ALL, "", selectUid + ":" + arenaRecord.getDefUid());
return CommonProto.ChampionBetInfo.newBuilder().setBlueCoins(defCoins.intValue()).setRedCoins(attackCoins.intValue()).setId(selectUid).build();
return CommonProto.ChampionBetInfo.newBuilder().setBlueCoins(attackCoins.intValue()).setRedCoins(defCoins.intValue()).setId(selectUid).build();
}
@ -965,7 +989,7 @@ public class ChampionshipLogic {
/**
* 1.
* 1.
*/
public static void selectToBattle(){
RedisUtil.getInstence().del(RedisUtil.getInstence().getKey(RedisKey.CHAMPION_CUR_JOIN_IDS,""));
@ -984,11 +1008,11 @@ public class ChampionshipLogic {
MemberInfo memberInfoDef =joinMembers.get(memberOfOneTeam.get(joinIndexBlue));
int attackUid = memberInfoAttack.getUid();
int defUid = memberInfoDef.getUid();
int type = memberInfoAttack.getType() + memberInfoDef.getType();
if(memberInfoAttack.getType() == 1){
attackUid = memberInfoDef.getUid();
defUid = memberInfoAttack.getUid();
attackUid = memberInfoDef.getUid();
defUid = memberInfoAttack.getUid();
}
int type = memberInfoAttack.getType() + memberInfoDef.getType();
ArenaRecord arenaRecord = new ArenaRecord();
arenaRecord.setId(KeyGenUtils.produceIdByModule(UUIDEnum.ARENARECORD,memberInfoAttack.getUid()));
arenaRecord.setAttackId(attackUid);
@ -1013,6 +1037,12 @@ public class ChampionshipLogic {
}
});
}
Map<Integer,Integer> memberPerOfTeam = new HashMap<>();
finalmemberOfTeam.forEach((k,v)->{
v.forEach(memberId->{
memberPerOfTeam.put(memberId,k);
});
});
int times = 0;
int length = possibleJoin.size();
if(length<8){
@ -1040,6 +1070,7 @@ public class ChampionshipLogic {
}else{
arenaRecord.setNums(times++%length);
}
LOGGER.info("the attackId={},the defid={},the rountTImes={},the team={},the position={}",attackUid,defUid,roundTimes,memberPerOfTeam.get(attackUid),arenaRecord.getNums());
arenaRecordMap.put(arenaRecord.getId(),arenaRecord);
}
@ -1132,25 +1163,6 @@ public class ChampionshipLogic {
*/
public static void switchBet(int functionId) throws Exception {
int[][] itemNum = STableManager.getFigureConfig(CommonStaticConfig.class).getsChampionshipSetting().getItemNum();
/* InnerMessageUtil.broadcastWithRandom(user1 -> {
if(user1==null){
return;
}
ISession session = OnlineUserManager.getSessionByUid(user1.getId());
if(null ==session){
return;
}
Map<Integer, SGlobalSystemConfig> sGlobalSystemConfigMap = STableManager.getConfig(SGlobalSystemConfig.class);
if(!HandlerLogicThread.checkOpen(user1, sGlobalSystemConfigMap.get(8))){
return;
}
MissionEventDistributor.requestStart();
CommonProto.Drop.Builder drop =
LOGGER.info("drop--->>>>>>>>> uid ={},drop={}",session.getUid(), JsonFormat.printToString(drop.build()));
MissionEventDistributor.requestEnd(session,true);
MongoUtil.getLjsdMongoTemplate().lastUpdate();
}, new LinkedList<>(OnlineUserManager.sessionMap.keySet()),1);*/
SGlobalSystemConfig sGlobalSystemConfig = STableManager.getConfig(SGlobalSystemConfig.class).get(functionId);
OnlineUserManager.sessionMap.values().forEach(session->{
try {
@ -1295,31 +1307,22 @@ public class ChampionshipLogic {
long diff = round - (sChampionshipSetting.getTrialsGroup() - 1);
int progressTmp;
if(diff<0){ //选拔赛
if(diff<=0){ //选拔赛
progressTmp =100 + roundTimes*10 + progressState;
schedule=1;
}else {//决赛
int totalWiner =sChampionshipSetting.getChampionshipPlayer()/ sChampionshipSetting.getTrialsGroup() * sChampionshipSetting.getTrialsGroupWinner();
if(diff>totalWiner){
if(isServerStart){
schedule=2;
progress= 253;
endTime = (int)( startTime/1000 + (round-1)*duration + getDuratimeByProgressState(3));
}
return;
}
if(Math.pow(2,diff)>=totalWiner){
if(isServerStart){
schedule=2;
progress= 253;
endTime = (int)( startTime/1000 + (round-1)*duration + getDuratimeByProgressState(3));
if(diff>totalWiner || Math.pow(2,diff)>=totalWiner){
schedule=2;
if(progress!=-2){
progress= -2;
sendAllProgressUpdate();
}
progress= -2;
return;
}
progressTmp = 200 + (int)(diff+1)*10 + progressState;
progressTmp = 200 + (int)(diff)*10 + progressState;
if(schedule==1){ // 刚开始进入决赛,选拔出选手
selectToJoinFinal();
}
@ -1345,6 +1348,10 @@ public class ChampionshipLogic {
scoreToRedis();
sendBetReward();
}
sendAllProgressUpdate();
}
public static void sendAllProgressUpdate(){
ArenaInfoProto.ChampionProgressUpdateIndication build = ArenaInfoProto.ChampionProgressUpdateIndication.newBuilder().setEndTime(endTime).setProgress(progress).build();
//向全服玩家广播进度变更信息
for(ISession session : OnlineUserManager.sessionMap.values()){

View File

@ -101,15 +101,20 @@ public class FightUtil {
}
}
if( fightEvent.getFightType()!=GameFightType.Arena2RobotFight){
if(fightTeamInfo==null){
User userInMem = UserManager.getUserInMem(pvpFightEvent.getAttackUid());
fightTeamInfo = makePersonFightData(userInMem, pvpFightEvent.getTeamId(),pvpFightEvent.getAttackBloodMap());
if(fightTeamInfo==null){
if( fightEvent.getFightType()!=GameFightType.Arena2RobotFight){
if( SArenaRobotConfig.getsArenaRobotConfigById(pvpFightEvent.getAttackUid()) !=null){
fightTeamInfo = makeRobotFightData(pvpFightEvent.getAttackUid());
}else{
User userInMem = UserManager.getUserInMem(pvpFightEvent.getAttackUid());
fightTeamInfo = makePersonFightData(userInMem, pvpFightEvent.getTeamId(),pvpFightEvent.getAttackBloodMap());
}
}else{
fightTeamInfo = makeRobotFightData(pvpFightEvent.getAttackUid());
}
}else{
fightTeamInfo = makeRobotFightData(pvpFightEvent.getDefUid());
}
LuaValue getFightData = FightDataUtil.getFinalPlayerFightData(fightTeamInfo, deffightTeamInfo);
LuaValue getOptionData = FightDataUtil.getOptionData(fightEvent.getFrames());
int[] fightResult = CheckFight.getInstance().checkFight(fightSeed, fightEvent.getMostTime(), getFightData, getOptionData, fightEvent.getFightType().getFightType());

View File

@ -338,7 +338,7 @@ public class WorkShopLogic {
int uid=session.getUid();
User user = UserManager.getUser(uid);
SGlobalSystemConfig sGlobalSystemConfig = STableManager.getConfig(SGlobalSystemConfig.class).get(FunctionIdEnum.Adventure.getFunctionId());
if (HandlerLogicThread.checkOpen(user,sGlobalSystemConfig)) {
if (!HandlerLogicThread.checkOpen(user,sGlobalSystemConfig)) {
throw new ErrorCodeException(ErrorCode.newDefineCode("未开"));
}
SWorkShopEquipmentConfig sWorkShopEquipmentConfig = SWorkShopEquipmentConfig.getsWorkShopEquipmentConfigMap().get(equipTid);