商店刷新 & 工会行走

wangyuan 2020-03-26 00:02:26 +08:00
parent 67b85decc5
commit d3a84ad2a8
18 changed files with 12123 additions and 168 deletions

View File

@ -86594,7 +86594,7 @@ public final class CommonProto {
* <code>optional int32 type = 3;</code>
*
* <pre>
*
* //1 //精英节点2;//首领节点3;//复活节点4;//回复节点5;//普通节点
* </pre>
*/
boolean hasType();
@ -86602,7 +86602,7 @@ public final class CommonProto {
* <code>optional int32 type = 3;</code>
*
* <pre>
*
* //1 //精英节点2;//首领节点3;//复活节点4;//回复节点5;//普通节点
* </pre>
*/
int getType();
@ -86638,7 +86638,7 @@ public final class CommonProto {
* <code>optional int32 state = 5;</code>
*
* <pre>
*&#47;/ 0 1 2 3
*&#47;/ 0 1 2 3 4
* </pre>
*/
boolean hasState();
@ -86646,7 +86646,7 @@ public final class CommonProto {
* <code>optional int32 state = 5;</code>
*
* <pre>
*&#47;/ 0 1 2 3
*&#47;/ 0 1 2 3 4
* </pre>
*/
int getState();
@ -86884,7 +86884,7 @@ public final class CommonProto {
* <code>optional int32 type = 3;</code>
*
* <pre>
*
* //1 //精英节点2;//首领节点3;//复活节点4;//回复节点5;//普通节点
* </pre>
*/
public boolean hasType() {
@ -86894,7 +86894,7 @@ public final class CommonProto {
* <code>optional int32 type = 3;</code>
*
* <pre>
*
* //1 //精英节点2;//首领节点3;//复活节点4;//回复节点5;//普通节点
* </pre>
*/
public int getType() {
@ -86942,7 +86942,7 @@ public final class CommonProto {
* <code>optional int32 state = 5;</code>
*
* <pre>
*&#47;/ 0 1 2 3
*&#47;/ 0 1 2 3 4
* </pre>
*/
public boolean hasState() {
@ -86952,7 +86952,7 @@ public final class CommonProto {
* <code>optional int32 state = 5;</code>
*
* <pre>
*&#47;/ 0 1 2 3
*&#47;/ 0 1 2 3 4
* </pre>
*/
public int getState() {
@ -87436,7 +87436,7 @@ public final class CommonProto {
* <code>optional int32 type = 3;</code>
*
* <pre>
*
* //1 //精英节点2;//首领节点3;//复活节点4;//回复节点5;//普通节点
* </pre>
*/
public boolean hasType() {
@ -87446,7 +87446,7 @@ public final class CommonProto {
* <code>optional int32 type = 3;</code>
*
* <pre>
*
* //1 //精英节点2;//首领节点3;//复活节点4;//回复节点5;//普通节点
* </pre>
*/
public int getType() {
@ -87456,7 +87456,7 @@ public final class CommonProto {
* <code>optional int32 type = 3;</code>
*
* <pre>
*
* //1 //精英节点2;//首领节点3;//复活节点4;//回复节点5;//普通节点
* </pre>
*/
public Builder setType(int value) {
@ -87469,7 +87469,7 @@ public final class CommonProto {
* <code>optional int32 type = 3;</code>
*
* <pre>
*
* //1 //精英节点2;//首领节点3;//复活节点4;//回复节点5;//普通节点
* </pre>
*/
public Builder clearType() {
@ -87638,7 +87638,7 @@ public final class CommonProto {
* <code>optional int32 state = 5;</code>
*
* <pre>
*&#47;/ 0 1 2 3
*&#47;/ 0 1 2 3 4
* </pre>
*/
public boolean hasState() {
@ -87648,7 +87648,7 @@ public final class CommonProto {
* <code>optional int32 state = 5;</code>
*
* <pre>
*&#47;/ 0 1 2 3
*&#47;/ 0 1 2 3 4
* </pre>
*/
public int getState() {
@ -87658,7 +87658,7 @@ public final class CommonProto {
* <code>optional int32 state = 5;</code>
*
* <pre>
*&#47;/ 0 1 2 3
*&#47;/ 0 1 2 3 4
* </pre>
*/
public Builder setState(int value) {
@ -87671,7 +87671,7 @@ public final class CommonProto {
* <code>optional int32 state = 5;</code>
*
* <pre>
*&#47;/ 0 1 2 3
*&#47;/ 0 1 2 3 4
* </pre>
*/
public Builder clearState() {
@ -88418,6 +88418,558 @@ public final class CommonProto {
// @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ExpeditionSimpleHeroInfo)
}
public interface ExpeditionEquipOrBuilder
extends com.google.protobuf.MessageOrBuilder {
// optional string id = 1;
/**
* <code>optional string id = 1;</code>
*/
boolean hasId();
/**
* <code>optional string id = 1;</code>
*/
java.lang.String getId();
/**
* <code>optional string id = 1;</code>
*/
com.google.protobuf.ByteString
getIdBytes();
// optional int32 equiptId = 2;
/**
* <code>optional int32 equiptId = 2;</code>
*/
boolean hasEquiptId();
/**
* <code>optional int32 equiptId = 2;</code>
*/
int getEquiptId();
}
/**
* Protobuf type {@code com.ljsd.jieling.protocols.ExpeditionEquip}
*/
public static final class ExpeditionEquip extends
com.google.protobuf.GeneratedMessage
implements ExpeditionEquipOrBuilder {
// Use ExpeditionEquip.newBuilder() to construct.
private ExpeditionEquip(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
private ExpeditionEquip(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final ExpeditionEquip defaultInstance;
public static ExpeditionEquip getDefaultInstance() {
return defaultInstance;
}
public ExpeditionEquip getDefaultInstanceForType() {
return defaultInstance;
}
private final com.google.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
public final com.google.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private ExpeditionEquip(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
com.google.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
int tag = input.readTag();
switch (tag) {
case 0:
done = true;
break;
default: {
if (!parseUnknownField(input, unknownFields,
extensionRegistry, tag)) {
done = true;
}
break;
}
case 10: {
bitField0_ |= 0x00000001;
id_ = input.readBytes();
break;
}
case 16: {
bitField0_ |= 0x00000002;
equiptId_ = input.readInt32();
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
throw new com.google.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionEquip_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionEquip_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip.class, com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip.Builder.class);
}
public static com.google.protobuf.Parser<ExpeditionEquip> PARSER =
new com.google.protobuf.AbstractParser<ExpeditionEquip>() {
public ExpeditionEquip parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return new ExpeditionEquip(input, extensionRegistry);
}
};
@java.lang.Override
public com.google.protobuf.Parser<ExpeditionEquip> getParserForType() {
return PARSER;
}
private int bitField0_;
// optional string id = 1;
public static final int ID_FIELD_NUMBER = 1;
private java.lang.Object id_;
/**
* <code>optional string id = 1;</code>
*/
public boolean hasId() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>optional string id = 1;</code>
*/
public java.lang.String getId() {
java.lang.Object ref = id_;
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()) {
id_ = s;
}
return s;
}
}
/**
* <code>optional string id = 1;</code>
*/
public com.google.protobuf.ByteString
getIdBytes() {
java.lang.Object ref = id_;
if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
id_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
// optional int32 equiptId = 2;
public static final int EQUIPTID_FIELD_NUMBER = 2;
private int equiptId_;
/**
* <code>optional int32 equiptId = 2;</code>
*/
public boolean hasEquiptId() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>optional int32 equiptId = 2;</code>
*/
public int getEquiptId() {
return equiptId_;
}
private void initFields() {
id_ = "";
equiptId_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1;
memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeBytes(1, getIdBytes());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt32(2, equiptId_);
}
getUnknownFields().writeTo(output);
}
private int memoizedSerializedSize = -1;
public int getSerializedSize() {
int size = memoizedSerializedSize;
if (size != -1) return size;
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(1, getIdBytes());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(2, equiptId_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
}
private static final long serialVersionUID = 0L;
@java.lang.Override
protected java.lang.Object writeReplace()
throws java.io.ObjectStreamException {
return super.writeReplace();
}
public static com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
public static com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
public static com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder(com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip 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.ExpeditionEquip}
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder<Builder>
implements com.ljsd.jieling.protocols.CommonProto.ExpeditionEquipOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionEquip_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionEquip_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip.class, com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip.Builder.class);
}
// Construct using com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip.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();
id_ = "";
bitField0_ = (bitField0_ & ~0x00000001);
equiptId_ = 0;
bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
public Builder clone() {
return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_ExpeditionEquip_descriptor;
}
public com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip getDefaultInstanceForType() {
return com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip.getDefaultInstance();
}
public com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip build() {
com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
public com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip buildPartial() {
com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip result = new com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
to_bitField0_ |= 0x00000001;
}
result.id_ = id_;
if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
to_bitField0_ |= 0x00000002;
}
result.equiptId_ = equiptId_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip) {
return mergeFrom((com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip)other);
} else {
super.mergeFrom(other);
return this;
}
}
public Builder mergeFrom(com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip other) {
if (other == com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip.getDefaultInstance()) return this;
if (other.hasId()) {
bitField0_ |= 0x00000001;
id_ = other.id_;
onChanged();
}
if (other.hasEquiptId()) {
setEquiptId(other.getEquiptId());
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
public final boolean isInitialized() {
return true;
}
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.ljsd.jieling.protocols.CommonProto.ExpeditionEquip) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
mergeFrom(parsedMessage);
}
}
return this;
}
private int bitField0_;
// optional string id = 1;
private java.lang.Object id_ = "";
/**
* <code>optional string id = 1;</code>
*/
public boolean hasId() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>optional string id = 1;</code>
*/
public java.lang.String getId() {
java.lang.Object ref = id_;
if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((com.google.protobuf.ByteString) ref)
.toStringUtf8();
id_ = s;
return s;
} else {
return (java.lang.String) ref;
}
}
/**
* <code>optional string id = 1;</code>
*/
public com.google.protobuf.ByteString
getIdBytes() {
java.lang.Object ref = id_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
id_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
/**
* <code>optional string id = 1;</code>
*/
public Builder setId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000001;
id_ = value;
onChanged();
return this;
}
/**
* <code>optional string id = 1;</code>
*/
public Builder clearId() {
bitField0_ = (bitField0_ & ~0x00000001);
id_ = getDefaultInstance().getId();
onChanged();
return this;
}
/**
* <code>optional string id = 1;</code>
*/
public Builder setIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000001;
id_ = value;
onChanged();
return this;
}
// optional int32 equiptId = 2;
private int equiptId_ ;
/**
* <code>optional int32 equiptId = 2;</code>
*/
public boolean hasEquiptId() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>optional int32 equiptId = 2;</code>
*/
public int getEquiptId() {
return equiptId_;
}
/**
* <code>optional int32 equiptId = 2;</code>
*/
public Builder setEquiptId(int value) {
bitField0_ |= 0x00000002;
equiptId_ = value;
onChanged();
return this;
}
/**
* <code>optional int32 equiptId = 2;</code>
*/
public Builder clearEquiptId() {
bitField0_ = (bitField0_ & ~0x00000002);
equiptId_ = 0;
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ExpeditionEquip)
}
static {
defaultInstance = new ExpeditionEquip(true);
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ExpeditionEquip)
}
private static com.google.protobuf.Descriptors.Descriptor
internal_static_com_ljsd_jieling_protocols_ErrorResponse_descriptor;
private static
@ -88898,6 +89450,11 @@ public final class CommonProto {
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
internal_static_com_ljsd_jieling_protocols_ExpeditionEquip_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_ljsd_jieling_protocols_ExpeditionEquip_fieldAccessorTable;
public static com.google.protobuf.Descriptors.FileDescriptor
getDescriptor() {
@ -89171,7 +89728,8 @@ public final class CommonProto {
".jieling.protocols.ExpeditionTeamInfo\022\r\n" +
"\005state\030\005 \001(\005\022\023\n\013holyEquipID\030\006 \003(\005\"<\n\030Exp" +
"editionSimpleHeroInfo\022\016\n\006heroId\030\001 \001(\t\022\020\n" +
"\010remainHp\030\002 \001(\001B\002H\001"
"\010remainHp\030\002 \001(\001\"/\n\017ExpeditionEquip\022\n\n\002id" +
"\030\001 \001(\t\022\020\n\010equiptId\030\002 \001(\005B\002H\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -89754,6 +90312,12 @@ public final class CommonProto {
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_ExpeditionSimpleHeroInfo_descriptor,
new java.lang.String[] { "HeroId", "RemainHp", });
internal_static_com_ljsd_jieling_protocols_ExpeditionEquip_descriptor =
getDescriptor().getMessageTypes().get(95);
internal_static_com_ljsd_jieling_protocols_ExpeditionEquip_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_ExpeditionEquip_descriptor,
new java.lang.String[] { "Id", "EquiptId", });
return null;
}
};

File diff suppressed because it is too large Load Diff

View File

@ -217,6 +217,24 @@ public final class Family {
* </pre>
*/
int getMaxBossHurt();
// optional int32 lastHurt = 12;
/**
* <code>optional int32 lastHurt = 12;</code>
*
* <pre>
*
* </pre>
*/
boolean hasLastHurt();
/**
* <code>optional int32 lastHurt = 12;</code>
*
* <pre>
*
* </pre>
*/
int getLastHurt();
}
/**
* Protobuf type {@code com.ljsd.jieling.protocols.FamilyUserInfo}
@ -324,6 +342,11 @@ public final class Family {
maxBossHurt_ = input.readInt32();
break;
}
case 96: {
bitField0_ |= 0x00000800;
lastHurt_ = input.readInt32();
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -659,6 +682,30 @@ public final class Family {
return maxBossHurt_;
}
// optional int32 lastHurt = 12;
public static final int LASTHURT_FIELD_NUMBER = 12;
private int lastHurt_;
/**
* <code>optional int32 lastHurt = 12;</code>
*
* <pre>
*
* </pre>
*/
public boolean hasLastHurt() {
return ((bitField0_ & 0x00000800) == 0x00000800);
}
/**
* <code>optional int32 lastHurt = 12;</code>
*
* <pre>
*
* </pre>
*/
public int getLastHurt() {
return lastHurt_;
}
private void initFields() {
roleUid_ = 0;
userName_ = "";
@ -671,6 +718,7 @@ public final class Family {
head_ = 0;
frame_ = 0;
maxBossHurt_ = 0;
lastHurt_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@ -737,6 +785,9 @@ public final class Family {
if (((bitField0_ & 0x00000400) == 0x00000400)) {
output.writeInt32(11, maxBossHurt_);
}
if (((bitField0_ & 0x00000800) == 0x00000800)) {
output.writeInt32(12, lastHurt_);
}
getUnknownFields().writeTo(output);
}
@ -790,6 +841,10 @@ public final class Family {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(11, maxBossHurt_);
}
if (((bitField0_ & 0x00000800) == 0x00000800)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(12, lastHurt_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@ -928,6 +983,8 @@ public final class Family {
bitField0_ = (bitField0_ & ~0x00000200);
maxBossHurt_ = 0;
bitField0_ = (bitField0_ & ~0x00000400);
lastHurt_ = 0;
bitField0_ = (bitField0_ & ~0x00000800);
return this;
}
@ -1000,6 +1057,10 @@ public final class Family {
to_bitField0_ |= 0x00000400;
}
result.maxBossHurt_ = maxBossHurt_;
if (((from_bitField0_ & 0x00000800) == 0x00000800)) {
to_bitField0_ |= 0x00000800;
}
result.lastHurt_ = lastHurt_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@ -1051,6 +1112,9 @@ public final class Family {
if (other.hasMaxBossHurt()) {
setMaxBossHurt(other.getMaxBossHurt());
}
if (other.hasLastHurt()) {
setLastHurt(other.getLastHurt());
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@ -1686,6 +1750,55 @@ public final class Family {
return this;
}
// optional int32 lastHurt = 12;
private int lastHurt_ ;
/**
* <code>optional int32 lastHurt = 12;</code>
*
* <pre>
*
* </pre>
*/
public boolean hasLastHurt() {
return ((bitField0_ & 0x00000800) == 0x00000800);
}
/**
* <code>optional int32 lastHurt = 12;</code>
*
* <pre>
*
* </pre>
*/
public int getLastHurt() {
return lastHurt_;
}
/**
* <code>optional int32 lastHurt = 12;</code>
*
* <pre>
*
* </pre>
*/
public Builder setLastHurt(int value) {
bitField0_ |= 0x00000800;
lastHurt_ = value;
onChanged();
return this;
}
/**
* <code>optional int32 lastHurt = 12;</code>
*
* <pre>
*
* </pre>
*/
public Builder clearLastHurt() {
bitField0_ = (bitField0_ & ~0x00000800);
lastHurt_ = 0;
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.FamilyUserInfo)
}
@ -37674,6 +37787,26 @@ public final class Family {
* <code>optional int32 isSuccess = 1;</code>
*/
int getIsSuccess();
// optional int32 itemId = 2;
/**
* <code>optional int32 itemId = 2;</code>
*/
boolean hasItemId();
/**
* <code>optional int32 itemId = 2;</code>
*/
int getItemId();
// optional int32 count = 3;
/**
* <code>optional int32 count = 3;</code>
*/
boolean hasCount();
/**
* <code>optional int32 count = 3;</code>
*/
int getCount();
}
/**
* Protobuf type {@code com.ljsd.jieling.protocols.RobRedPackageResponse}
@ -37731,6 +37864,16 @@ public final class Family {
isSuccess_ = input.readInt32();
break;
}
case 16: {
bitField0_ |= 0x00000002;
itemId_ = input.readInt32();
break;
}
case 24: {
bitField0_ |= 0x00000004;
count_ = input.readInt32();
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -37787,8 +37930,42 @@ public final class Family {
return isSuccess_;
}
// 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 count = 3;
public static final int COUNT_FIELD_NUMBER = 3;
private int count_;
/**
* <code>optional int32 count = 3;</code>
*/
public boolean hasCount() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* <code>optional int32 count = 3;</code>
*/
public int getCount() {
return count_;
}
private void initFields() {
isSuccess_ = 0;
itemId_ = 0;
count_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@ -37805,6 +37982,12 @@ public final class Family {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeInt32(1, isSuccess_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt32(2, itemId_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeInt32(3, count_);
}
getUnknownFields().writeTo(output);
}
@ -37818,6 +38001,14 @@ public final class Family {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(1, isSuccess_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(2, itemId_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(3, count_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@ -37936,6 +38127,10 @@ public final class Family {
super.clear();
isSuccess_ = 0;
bitField0_ = (bitField0_ & ~0x00000001);
itemId_ = 0;
bitField0_ = (bitField0_ & ~0x00000002);
count_ = 0;
bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
@ -37968,6 +38163,14 @@ public final class Family {
to_bitField0_ |= 0x00000001;
}
result.isSuccess_ = isSuccess_;
if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
to_bitField0_ |= 0x00000002;
}
result.itemId_ = itemId_;
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004;
}
result.count_ = count_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@ -37987,6 +38190,12 @@ public final class Family {
if (other.hasIsSuccess()) {
setIsSuccess(other.getIsSuccess());
}
if (other.hasItemId()) {
setItemId(other.getItemId());
}
if (other.hasCount()) {
setCount(other.getCount());
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@ -38047,6 +38256,72 @@ public final class Family {
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 count = 3;
private int count_ ;
/**
* <code>optional int32 count = 3;</code>
*/
public boolean hasCount() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* <code>optional int32 count = 3;</code>
*/
public int getCount() {
return count_;
}
/**
* <code>optional int32 count = 3;</code>
*/
public Builder setCount(int value) {
bitField0_ |= 0x00000004;
count_ = value;
onChanged();
return this;
}
/**
* <code>optional int32 count = 3;</code>
*/
public Builder clearCount() {
bitField0_ = (bitField0_ & ~0x00000004);
count_ = 0;
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.RobRedPackageResponse)
}
@ -40708,137 +40983,138 @@ public final class Family {
static {
java.lang.String[] descriptorData = {
"\n\014Family.proto\022\032com.ljsd.jieling.protoco" +
"ls\032\021CommonProto.proto\"\333\001\n\016FamilyUserInfo" +
"ls\032\021CommonProto.proto\"\355\001\n\016FamilyUserInfo" +
"\022\017\n\007roleUid\030\001 \002(\005\022\020\n\010userName\030\002 \002(\t\022\021\n\tu" +
"serLevel\030\003 \002(\005\022\020\n\010position\030\004 \002(\005\022\022\n\ncont" +
"ribute\030\005 \002(\005\022\017\n\007seconds\030\006 \001(\005\022\027\n\017contrib" +
"uteToday\030\007 \001(\005\022\021\n\tsoulForce\030\010 \001(\005\022\014\n\004hea" +
"d\030\t \001(\005\022\r\n\005frame\030\n \001(\005\022\023\n\013maxBossHurt\030\013 " +
"\001(\005\"9\n\rFamilyLogInfo\022\014\n\004name\030\001 \001(\t\022\014\n\004in" +
"fo\030\002 \001(\t\022\014\n\004time\030\003 \001(\005\"_\n\024FamilyWalkIndi" +
"caiton\022\014\n\004path\030\001 \003(\005\022\016\n\006curPos\030\002 \001(\005\022\013\n\003",
"uid\030\003 \001(\005\022\014\n\004name\030\004 \001(\t\022\016\n\006gender\030\005 \001(\005\"" +
"\210\001\n\013FamilyApply\022\014\n\004name\030\001 \001(\t\022\017\n\007roleUid" +
"\030\002 \001(\005\022\014\n\004time\030\003 \001(\005\022\r\n\005frame\030\004 \001(\005\022\017\n\007o" +
"utTime\030\005 \001(\005\022\r\n\005level\030\006 \001(\005\022\017\n\007foreces\030\007" +
" \001(\005\022\014\n\004head\030\010 \001(\005\"l\n\020FamilyNoticeInfo\022\023" +
"\n\013guildNotice\030\001 \002(\t\022\022\n\nupdateTime\030\002 \002(\005\022" +
"\r\n\005steps\030\003 \003(\005\022\020\n\010adminres\030\004 \003(\005\022\016\n\006hasN" +
"ew\030\005 \002(\005\"i\n\022FamilyRecomandInfo\022B\n\016family" +
"BaseInfo\030\001 \001(\0132*.com.ljsd.jieling.protoc" +
"ols.FamilyBaseInfo\022\017\n\007isApply\030\002 \001(\005\"U\n\020F",
"amilyDefendInfo\022\013\n\003uid\030\001 \001(\005\022\021\n\tstarCoun" +
"t\030\002 \001(\005\022\017\n\007buildId\030\003 \001(\005\022\020\n\010curForce\030\004 \001" +
"(\005\"6\n\023FamilyBuildBuffInfo\022\017\n\007buildId\030\001 \001" +
"(\005\022\016\n\006buffId\030\002 \003(\005\"y\n\025FamilyFightPlayerI" +
"nfo\022<\n\010userInfo\030\001 \001(\0132*.com.ljsd.jieling" +
".protocols.FamilyUserInfo\022\021\n\tstarCount\030\002" +
" \001(\005\022\017\n\007buildId\030\003 \001(\005\"\243\001\n\017FamilyFightInf" +
"o\022\013\n\003gid\030\001 \001(\005\022B\n\tbuildBuff\030\002 \003(\0132/.com." +
"ljsd.jieling.protocols.FamilyBuildBuffIn" +
"fo\022?\n\004user\030\003 \003(\01321.com.ljsd.jieling.prot",
"ocols.FamilyFightPlayerInfo\"\204\002\n\025GetFamil" +
"yInfoResponse\022B\n\016familyBaseInfo\030\001 \001(\0132*." +
"com.ljsd.jieling.protocols.FamilyBaseInf" +
"o\022B\n\016familyUserInfo\030\002 \001(\0132*.com.ljsd.jie" +
"ling.protocols.FamilyUserInfo\022N\n\024familyW" +
"alkIndicaiton\030\003 \003(\01320.com.ljsd.jieling.p" +
"rotocols.FamilyWalkIndicaiton\022\023\n\013guildBo" +
"ssId\030\004 \001(\005\"5\n\023FamilyCreateReqeust\022\014\n\004nam" +
"e\030\001 \001(\t\022\020\n\010announce\030\002 \001(\t\"\356\001\n\024FamilyCrea" +
"teResponse\022B\n\016familyBaseInfo\030\001 \001(\0132*.com",
".ljsd.jieling.protocols.FamilyBaseInfo\022B" +
"\n\016familyUserInfo\030\002 \001(\0132*.com.ljsd.jielin" +
"g.protocols.FamilyUserInfo\022N\n\024familyWalk" +
"Indicaiton\030\003 \001(\01320.com.ljsd.jieling.prot" +
"ocols.FamilyWalkIndicaiton\"#\n\023FamilySear" +
"chReqeust\022\014\n\004name\030\001 \001(\t\"a\n\023FamilySeachRe" +
"sponse\022J\n\022familyRecomandInfo\030\001 \003(\0132..com" +
".ljsd.jieling.protocols.FamilyRecomandIn" +
"fo\"&\n\022FamilyApplyRequest\022\020\n\010familyId\030\001 \003" +
"(\005\"\235\001\n\023FamilyJoinIndicaion\022B\n\016familyBase",
"Info\030\001 \001(\0132*.com.ljsd.jieling.protocols." +
"FamilyBaseInfo\022B\n\016familyUserInfo\030\002 \001(\0132*" +
".com.ljsd.jieling.protocols.FamilyUserIn" +
"fo\"%\n\021FamilyJoinRequest\022\020\n\010familyId\030\001 \001(" +
"\005\"b\n\022FamilyJoinResponse\022L\n\023familyJoinInd" +
"icaion\030\001 \001(\0132/.com.ljsd.jieling.protocol" +
"s.FamilyJoinIndicaion\"e\n\027FamilyRecommand" +
"Response\022J\n\022familyRecomandInfo\030\001 \003(\0132..c" +
"om.ljsd.jieling.protocols.FamilyRecomand" +
"Info\"a\n\033GetFamilyMemberInfoResponse\022B\n\016f",
"amilyUserInfo\030\001 \003(\0132*.com.ljsd.jieling.p" +
"rotocols.FamilyUserInfo\"X\n\024GetFamilyLogR" +
"esponse\022@\n\rfamilyLogInfo\030\001 \003(\0132).com.ljs" +
"d.jieling.protocols.FamilyLogInfo\"V\n\026Get" +
"FamilyApplyResponse\022<\n\013familyApply\030\001 \003(\013" +
"2\'.com.ljsd.jieling.protocols.FamilyAppl" +
"y\"<\n\033FamilyOperationApplyRequest\022\014\n\004type" +
"\030\001 \001(\005\022\017\n\007applyId\030\002 \001(\005\")\n\024FamilyKickOut" +
"Request\022\021\n\ttargetUid\030\001 \001(\005\"?\n\030FamilyAppo" +
"intmentReqeust\022\021\n\ttargetUid\030\001 \001(\005\022\020\n\010pos",
"ition\030\002 \001(\005\"?\n\036FamilyPositionUpdateIndic" +
"ation\022\020\n\010position\030\001 \001(\005\022\013\n\003uid\030\002 \001(\005\"4\n\023" +
"FamilyChangeRequest\022\014\n\004type\030\001 \001(\005\022\017\n\007con" +
"tent\030\002 \001(\t\"3\n\024FamilyChangeResponse\022\016\n\006re" +
"sult\030\001 \001(\005\022\013\n\003err\030\002 \001(\t\">\n\033FamilyChangeJ" +
"oinTypeRequest\022\014\n\004type\030\001 \001(\005\022\021\n\tintoLeve" +
"l\030\002 \001(\005\"\\\n\026FamilyChangeIndication\022B\n\016fam" +
"ilyBaseInfo\030\001 \001(\0132*.com.ljsd.jieling.pro" +
"tocols.FamilyBaseInfo\"0\n\033FamilyChairmanC" +
"hangeRequest\022\021\n\ttargetUid\030\001 \001(\005\"(\n\030Famil",
"yDissolutionRequest\022\014\n\004type\030\001 \001(\005\"V\n\030Fam" +
"ilyDefendViewResponse\022:\n\004info\030\001 \003(\0132,.co" +
"m.ljsd.jieling.protocols.FamilyDefendInf" +
"o\">\n\035FamilyDefendDetailViewRequest\022\020\n\010pl" +
"ayerId\030\001 \001(\005\022\013\n\003gid\030\002 \001(\005\"_\n\036FamilyDefen" +
"dDetailViewResponse\022=\n\010teamInfo\030\001 \001(\0132+." +
"com.ljsd.jieling.protocols.TeamOneTeamIn" +
"fo\"8\n\030FamilyQuickDefendRequest\022\017\n\007buildI" +
"d\030\001 \001(\005\022\013\n\003uid\030\002 \001(\005\"!\n\021FamilyWalkReques" +
"t\022\014\n\004path\030\001 \003(\005\"T\n\027FamilyFightInfoRespon",
"se\0229\n\004info\030\001 \003(\0132+.com.ljsd.jieling.prot" +
"ocols.FamilyFightInfo\"q\n\013EnemyFamily\022\n\n\002" +
"id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\r\n\005level\030\003 \001(\005\022\021\n" +
"\tpictureId\030\004 \001(\005\022\021\n\ttotalStar\030\005 \001(\005\022\023\n\013m" +
"yTotalStar\030\006 \001(\005\"\310\001\n\030FamilyFightRoundRes" +
"ponse\022\014\n\004type\030\001 \001(\005\022\021\n\tstartTime\030\002 \001(\005\022\026" +
"\n\016roundStartTime\030\003 \001(\005\022\024\n\014roundEndTime\030\004" +
" \001(\005\022\020\n\010joinType\030\005 \001(\005\0226\n\005enemy\030\006 \001(\0132\'." +
"com.ljsd.jieling.protocols.EnemyFamily\022\023" +
"\n\013attackCount\030\007 \001(\005\":\n\030FamilyFightAttack",
"Request\022\021\n\tattackUid\030\001 \001(\005\022\013\n\003gid\030\002 \001(\005\"" +
"s\n\031FamilyFightAttackResponse\022\016\n\006result\030\001" +
" \001(\005\022\021\n\tstarCount\030\002 \001(\005\0223\n\004data\030\003 \001(\0132%." +
"com.ljsd.jieling.protocols.FightData\"\231\001\n" +
"\023PersonalFightResult\022\014\n\004rank\030\001 \001(\005\022\013\n\003ui" +
"d\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\020\n\010position\030\006 \001(\005\022\023\n\013atta" +
"ckCount\030\007 \001(\005\022\021\n\tstarCount\030\010 \001(\005\"*\n\032Pers" +
"onalFightResultRequest\022\014\n\004type\030\001 \001(\005\"^\n\033" +
"PersonalFightResultResponse\022?\n\006result\030\001 ",
"\003(\0132/.com.ljsd.jieling.protocols.Persona" +
"lFightResult\"j\n\030GuildFightResultResponse" +
"\022\016\n\006getExp\030\001 \001(\005\022\014\n\004star\030\002 \003(\005\022\021\n\textraS" +
"tar\030\003 \003(\005\022\r\n\005level\030\004 \001(\005\022\016\n\006curExp\030\005 \001(\005" +
"\"3\n\016DefeatResponse\022\013\n\003uid\030\001 \001(\005\022\024\n\014teamL" +
"ostStar\030\002 \001(\005\"#\n\021ChangeIconRequest\022\016\n\006ic" +
"onId\030\001 \001(\005\"V\n\032GetAttackHeroBloodResponse" +
"\0228\n\005blood\030\001 \003(\0132).com.ljsd.jieling.proto" +
"cols.HeroBloodInfo\" \n\020RefuseJoinFamily\022\014" +
"\n\004name\030\001 \001(\t\" \n\021KickOutIndication\022\013\n\003uid",
"\030\001 \001(\005\"P\n\030GetAllRedPackageResponse\0224\n\004in" +
"fo\030\001 \003(\0132&.com.ljsd.jieling.protocols.Re" +
"dPackage\"\"\n\024RobRedPackageRequest\022\n\n\002id\030\001" +
" \001(\005\"*\n\025RobRedPackageResponse\022\021\n\tisSucce" +
"ss\030\001 \001(\005\"%\n\027RedPackageDetailRequest\022\n\n\002i" +
"d\030\001 \001(\005\"\231\001\n\030RedPackageDetailResponse\0226\n\004" +
"info\030\001 \003(\0132(.com.ljsd.jieling.protocols." +
"RedOneDetail\022\022\n\nremainTime\030\002 \001(\005\022\020\n\010send" +
"Name\030\003 \001(\t\022\014\n\004head\030\004 \001(\005\022\021\n\theadFrame\030\005 " +
"\001(\005\"$\n\025RedPackageLikeRequest\022\013\n\003uid\030\001 \001(",
"\005\"%\n\026GetAllSendLikeResponse\022\013\n\003uid\030\001 \003(\005" +
"B\002H\001"
"\001(\005\022\020\n\010lastHurt\030\014 \001(\005\"9\n\rFamilyLogInfo\022\014" +
"\n\004name\030\001 \001(\t\022\014\n\004info\030\002 \001(\t\022\014\n\004time\030\003 \001(\005" +
"\"_\n\024FamilyWalkIndicaiton\022\014\n\004path\030\001 \003(\005\022\016",
"\n\006curPos\030\002 \001(\005\022\013\n\003uid\030\003 \001(\005\022\014\n\004name\030\004 \001(" +
"\t\022\016\n\006gender\030\005 \001(\005\"\210\001\n\013FamilyApply\022\014\n\004nam" +
"e\030\001 \001(\t\022\017\n\007roleUid\030\002 \001(\005\022\014\n\004time\030\003 \001(\005\022\r" +
"\n\005frame\030\004 \001(\005\022\017\n\007outTime\030\005 \001(\005\022\r\n\005level\030" +
"\006 \001(\005\022\017\n\007foreces\030\007 \001(\005\022\014\n\004head\030\010 \001(\005\"l\n\020" +
"FamilyNoticeInfo\022\023\n\013guildNotice\030\001 \002(\t\022\022\n" +
"\nupdateTime\030\002 \002(\005\022\r\n\005steps\030\003 \003(\005\022\020\n\010admi" +
"nres\030\004 \003(\005\022\016\n\006hasNew\030\005 \002(\005\"i\n\022FamilyReco" +
"mandInfo\022B\n\016familyBaseInfo\030\001 \001(\0132*.com.l" +
"jsd.jieling.protocols.FamilyBaseInfo\022\017\n\007",
"isApply\030\002 \001(\005\"U\n\020FamilyDefendInfo\022\013\n\003uid" +
"\030\001 \001(\005\022\021\n\tstarCount\030\002 \001(\005\022\017\n\007buildId\030\003 \001" +
"(\005\022\020\n\010curForce\030\004 \001(\005\"6\n\023FamilyBuildBuffI" +
"nfo\022\017\n\007buildId\030\001 \001(\005\022\016\n\006buffId\030\002 \003(\005\"y\n\025" +
"FamilyFightPlayerInfo\022<\n\010userInfo\030\001 \001(\0132" +
"*.com.ljsd.jieling.protocols.FamilyUserI" +
"nfo\022\021\n\tstarCount\030\002 \001(\005\022\017\n\007buildId\030\003 \001(\005\"" +
"\243\001\n\017FamilyFightInfo\022\013\n\003gid\030\001 \001(\005\022B\n\tbuil" +
"dBuff\030\002 \003(\0132/.com.ljsd.jieling.protocols" +
".FamilyBuildBuffInfo\022?\n\004user\030\003 \003(\01321.com",
".ljsd.jieling.protocols.FamilyFightPlaye" +
"rInfo\"\204\002\n\025GetFamilyInfoResponse\022B\n\016famil" +
"yBaseInfo\030\001 \001(\0132*.com.ljsd.jieling.proto" +
"cols.FamilyBaseInfo\022B\n\016familyUserInfo\030\002 " +
"\001(\0132*.com.ljsd.jieling.protocols.FamilyU" +
"serInfo\022N\n\024familyWalkIndicaiton\030\003 \003(\01320." +
"com.ljsd.jieling.protocols.FamilyWalkInd" +
"icaiton\022\023\n\013guildBossId\030\004 \001(\005\"5\n\023FamilyCr" +
"eateReqeust\022\014\n\004name\030\001 \001(\t\022\020\n\010announce\030\002 " +
"\001(\t\"\356\001\n\024FamilyCreateResponse\022B\n\016familyBa",
"seInfo\030\001 \001(\0132*.com.ljsd.jieling.protocol" +
"s.FamilyBaseInfo\022B\n\016familyUserInfo\030\002 \001(\013" +
"2*.com.ljsd.jieling.protocols.FamilyUser" +
"Info\022N\n\024familyWalkIndicaiton\030\003 \001(\01320.com" +
".ljsd.jieling.protocols.FamilyWalkIndica" +
"iton\"#\n\023FamilySearchReqeust\022\014\n\004name\030\001 \001(" +
"\t\"a\n\023FamilySeachResponse\022J\n\022familyRecoma" +
"ndInfo\030\001 \003(\0132..com.ljsd.jieling.protocol" +
"s.FamilyRecomandInfo\"&\n\022FamilyApplyReque" +
"st\022\020\n\010familyId\030\001 \003(\005\"\235\001\n\023FamilyJoinIndic",
"aion\022B\n\016familyBaseInfo\030\001 \001(\0132*.com.ljsd." +
"jieling.protocols.FamilyBaseInfo\022B\n\016fami" +
"lyUserInfo\030\002 \001(\0132*.com.ljsd.jieling.prot" +
"ocols.FamilyUserInfo\"%\n\021FamilyJoinReques" +
"t\022\020\n\010familyId\030\001 \001(\005\"b\n\022FamilyJoinRespons" +
"e\022L\n\023familyJoinIndicaion\030\001 \001(\0132/.com.ljs" +
"d.jieling.protocols.FamilyJoinIndicaion\"" +
"e\n\027FamilyRecommandResponse\022J\n\022familyReco" +
"mandInfo\030\001 \003(\0132..com.ljsd.jieling.protoc" +
"ols.FamilyRecomandInfo\"a\n\033GetFamilyMembe",
"rInfoResponse\022B\n\016familyUserInfo\030\001 \003(\0132*." +
"com.ljsd.jieling.protocols.FamilyUserInf" +
"o\"X\n\024GetFamilyLogResponse\022@\n\rfamilyLogIn" +
"fo\030\001 \003(\0132).com.ljsd.jieling.protocols.Fa" +
"milyLogInfo\"V\n\026GetFamilyApplyResponse\022<\n" +
"\013familyApply\030\001 \003(\0132\'.com.ljsd.jieling.pr" +
"otocols.FamilyApply\"<\n\033FamilyOperationAp" +
"plyRequest\022\014\n\004type\030\001 \001(\005\022\017\n\007applyId\030\002 \001(" +
"\005\")\n\024FamilyKickOutRequest\022\021\n\ttargetUid\030\001" +
" \001(\005\"?\n\030FamilyAppointmentReqeust\022\021\n\ttarg",
"etUid\030\001 \001(\005\022\020\n\010position\030\002 \001(\005\"?\n\036FamilyP" +
"ositionUpdateIndication\022\020\n\010position\030\001 \001(" +
"\005\022\013\n\003uid\030\002 \001(\005\"4\n\023FamilyChangeRequest\022\014\n" +
"\004type\030\001 \001(\005\022\017\n\007content\030\002 \001(\t\"3\n\024FamilyCh" +
"angeResponse\022\016\n\006result\030\001 \001(\005\022\013\n\003err\030\002 \001(" +
"\t\">\n\033FamilyChangeJoinTypeRequest\022\014\n\004type" +
"\030\001 \001(\005\022\021\n\tintoLevel\030\002 \001(\005\"\\\n\026FamilyChang" +
"eIndication\022B\n\016familyBaseInfo\030\001 \001(\0132*.co" +
"m.ljsd.jieling.protocols.FamilyBaseInfo\"" +
"0\n\033FamilyChairmanChangeRequest\022\021\n\ttarget",
"Uid\030\001 \001(\005\"(\n\030FamilyDissolutionRequest\022\014\n" +
"\004type\030\001 \001(\005\"V\n\030FamilyDefendViewResponse\022" +
":\n\004info\030\001 \003(\0132,.com.ljsd.jieling.protoco" +
"ls.FamilyDefendInfo\">\n\035FamilyDefendDetai" +
"lViewRequest\022\020\n\010playerId\030\001 \001(\005\022\013\n\003gid\030\002 " +
"\001(\005\"_\n\036FamilyDefendDetailViewResponse\022=\n" +
"\010teamInfo\030\001 \001(\0132+.com.ljsd.jieling.proto" +
"cols.TeamOneTeamInfo\"8\n\030FamilyQuickDefen" +
"dRequest\022\017\n\007buildId\030\001 \001(\005\022\013\n\003uid\030\002 \001(\005\"!" +
"\n\021FamilyWalkRequest\022\014\n\004path\030\001 \003(\005\"T\n\027Fam",
"ilyFightInfoResponse\0229\n\004info\030\001 \003(\0132+.com" +
".ljsd.jieling.protocols.FamilyFightInfo\"" +
"q\n\013EnemyFamily\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t" +
"\022\r\n\005level\030\003 \001(\005\022\021\n\tpictureId\030\004 \001(\005\022\021\n\tto" +
"talStar\030\005 \001(\005\022\023\n\013myTotalStar\030\006 \001(\005\"\310\001\n\030F" +
"amilyFightRoundResponse\022\014\n\004type\030\001 \001(\005\022\021\n" +
"\tstartTime\030\002 \001(\005\022\026\n\016roundStartTime\030\003 \001(\005" +
"\022\024\n\014roundEndTime\030\004 \001(\005\022\020\n\010joinType\030\005 \001(\005" +
"\0226\n\005enemy\030\006 \001(\0132\'.com.ljsd.jieling.proto" +
"cols.EnemyFamily\022\023\n\013attackCount\030\007 \001(\005\":\n",
"\030FamilyFightAttackRequest\022\021\n\tattackUid\030\001" +
" \001(\005\022\013\n\003gid\030\002 \001(\005\"s\n\031FamilyFightAttackRe" +
"sponse\022\016\n\006result\030\001 \001(\005\022\021\n\tstarCount\030\002 \001(" +
"\005\0223\n\004data\030\003 \001(\0132%.com.ljsd.jieling.proto" +
"cols.FightData\"\231\001\n\023PersonalFightResult\022\014" +
"\n\004rank\030\001 \001(\005\022\013\n\003uid\030\002 \001(\005\022\014\n\004name\030\003 \001(\t\022" +
"\014\n\004head\030\004 \001(\005\022\021\n\theadFrame\030\005 \001(\005\022\020\n\010posi" +
"tion\030\006 \001(\005\022\023\n\013attackCount\030\007 \001(\005\022\021\n\tstarC" +
"ount\030\010 \001(\005\"*\n\032PersonalFightResultRequest" +
"\022\014\n\004type\030\001 \001(\005\"^\n\033PersonalFightResultRes",
"ponse\022?\n\006result\030\001 \003(\0132/.com.ljsd.jieling" +
".protocols.PersonalFightResult\"j\n\030GuildF" +
"ightResultResponse\022\016\n\006getExp\030\001 \001(\005\022\014\n\004st" +
"ar\030\002 \003(\005\022\021\n\textraStar\030\003 \003(\005\022\r\n\005level\030\004 \001" +
"(\005\022\016\n\006curExp\030\005 \001(\005\"3\n\016DefeatResponse\022\013\n\003" +
"uid\030\001 \001(\005\022\024\n\014teamLostStar\030\002 \001(\005\"#\n\021Chang" +
"eIconRequest\022\016\n\006iconId\030\001 \001(\005\"V\n\032GetAttac" +
"kHeroBloodResponse\0228\n\005blood\030\001 \003(\0132).com." +
"ljsd.jieling.protocols.HeroBloodInfo\" \n\020" +
"RefuseJoinFamily\022\014\n\004name\030\001 \001(\t\" \n\021KickOu",
"tIndication\022\013\n\003uid\030\001 \001(\005\"P\n\030GetAllRedPac" +
"kageResponse\0224\n\004info\030\001 \003(\0132&.com.ljsd.ji" +
"eling.protocols.RedPackage\"\"\n\024RobRedPack" +
"ageRequest\022\n\n\002id\030\001 \001(\005\"I\n\025RobRedPackageR" +
"esponse\022\021\n\tisSuccess\030\001 \001(\005\022\016\n\006itemId\030\002 \001" +
"(\005\022\r\n\005count\030\003 \001(\005\"%\n\027RedPackageDetailReq" +
"uest\022\n\n\002id\030\001 \001(\005\"\231\001\n\030RedPackageDetailRes" +
"ponse\0226\n\004info\030\001 \003(\0132(.com.ljsd.jieling.p" +
"rotocols.RedOneDetail\022\022\n\nremainTime\030\002 \001(" +
"\005\022\020\n\010sendName\030\003 \001(\t\022\014\n\004head\030\004 \001(\005\022\021\n\thea",
"dFrame\030\005 \001(\005\"$\n\025RedPackageLikeRequest\022\013\n" +
"\003uid\030\001 \001(\005\"%\n\026GetAllSendLikeResponse\022\013\n\003" +
"uid\030\001 \003(\005B\002H\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -40850,7 +41126,7 @@ public final class Family {
internal_static_com_ljsd_jieling_protocols_FamilyUserInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_FamilyUserInfo_descriptor,
new java.lang.String[] { "RoleUid", "UserName", "UserLevel", "Position", "Contribute", "Seconds", "ContributeToday", "SoulForce", "Head", "Frame", "MaxBossHurt", });
new java.lang.String[] { "RoleUid", "UserName", "UserLevel", "Position", "Contribute", "Seconds", "ContributeToday", "SoulForce", "Head", "Frame", "MaxBossHurt", "LastHurt", });
internal_static_com_ljsd_jieling_protocols_FamilyLogInfo_descriptor =
getDescriptor().getMessageTypes().get(1);
internal_static_com_ljsd_jieling_protocols_FamilyLogInfo_fieldAccessorTable = new
@ -41174,7 +41450,7 @@ public final class Family {
internal_static_com_ljsd_jieling_protocols_RobRedPackageResponse_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_RobRedPackageResponse_descriptor,
new java.lang.String[] { "IsSuccess", });
new java.lang.String[] { "IsSuccess", "ItemId", "Count", });
internal_static_com_ljsd_jieling_protocols_RedPackageDetailRequest_descriptor =
getDescriptor().getMessageTypes().get(55);
internal_static_com_ljsd_jieling_protocols_RedPackageDetailRequest_fieldAccessorTable = new

View File

@ -3136,6 +3136,22 @@ public final class MessageTypeProto {
* <code>EXPEDITION_RECOVER_HERO_RESONSE = 20015;</code>
*/
EXPEDITION_RECOVER_HERO_RESONSE(500, 20015),
/**
* <code>EXPEDITION_HOLY_BAG_INDICATION = 20016;</code>
*
* <pre>
*
* </pre>
*/
EXPEDITION_HOLY_BAG_INDICATION(501, 20016),
/**
* <code>EXPEDITION_NOINFO_INDICATION = 20017;</code>
*
* <pre>
*
* </pre>
*/
EXPEDITION_NOINFO_INDICATION(502, 20017),
;
/**
@ -6261,6 +6277,22 @@ public final class MessageTypeProto {
* <code>EXPEDITION_RECOVER_HERO_RESONSE = 20015;</code>
*/
public static final int EXPEDITION_RECOVER_HERO_RESONSE_VALUE = 20015;
/**
* <code>EXPEDITION_HOLY_BAG_INDICATION = 20016;</code>
*
* <pre>
*
* </pre>
*/
public static final int EXPEDITION_HOLY_BAG_INDICATION_VALUE = 20016;
/**
* <code>EXPEDITION_NOINFO_INDICATION = 20017;</code>
*
* <pre>
*
* </pre>
*/
public static final int EXPEDITION_NOINFO_INDICATION_VALUE = 20017;
public final int getNumber() { return value; }
@ -6768,6 +6800,8 @@ public final class MessageTypeProto {
case 20013: return EXPEDITION_TAKE_HOLY_EQUIP_RESONSE;
case 20014: return EXPEDITION_RECOVER_HERO_REQUEST;
case 20015: return EXPEDITION_RECOVER_HERO_RESONSE;
case 20016: return EXPEDITION_HOLY_BAG_INDICATION;
case 20017: return EXPEDITION_NOINFO_INDICATION;
default: return null;
}
}
@ -6829,7 +6863,7 @@ public final class MessageTypeProto {
static {
java.lang.String[] descriptorData = {
"\n\026MessageTypeProto.proto\022\032com.ljsd.jieli" +
"ng.protocols*\226\177\n\013MessageType\022\027\n\022HEART_BE" +
"ng.protocols*\340\177\n\013MessageType\022\027\n\022HEART_BE" +
"AT_REQUEST\020\350\007\022\030\n\023HEART_BEAT_RESPONSE\020\351\007\022" +
"\036\n\031ACTIVITE_WORKSHOP_REQUEST\020\224N\022\037\n\032ACTIV" +
"ITE_WORKSHOP_RESPONSE\020\225N\022\027\n\022ARENA_INFO_R" +
@ -7236,7 +7270,9 @@ public final class MessageTypeProto {
"P_REQUEST\020\254\234\001\022(\n\"EXPEDITION_TAKE_HOLY_EQ" +
"UIP_RESONSE\020\255\234\001\022%\n\037EXPEDITION_RECOVER_HE" +
"RO_REQUEST\020\256\234\001\022%\n\037EXPEDITION_RECOVER_HER" +
"O_RESONSE\020\257\234\001B\002H\001"
"O_RESONSE\020\257\234\001\022$\n\036EXPEDITION_HOLY_BAG_IND" +
"ICATION\020\260\234\001\022\"\n\034EXPEDITION_NOINFO_INDICAT",
"ION\020\261\234\001B\002H\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {

View File

@ -71,7 +71,7 @@ public class CommonStaticConfig extends AbstractClassStaticConfig {
try {
SChallengeMapConfig sChallengeMapConfig = STableManager.getConfig(SChallengeMapConfig.class).get(11);
initPos = CellUtil.xy2Pos(sChallengeMapConfig.getPosition()[0], sChallengeMapConfig.getPosition()[1]);
initPos = sChallengeMapConfig.getPosition()[0]*100*25600+ sChallengeMapConfig.getPosition()[1]*100;
} catch (Exception e) {
LOGGER.error("sChallengeMapConfig init fail",e);
}

View File

@ -97,7 +97,7 @@ public enum FunctionIdEnum {
public static FunctionIdEnum getFunctionIdEnumByProto(int protoId){
return protoMap.get(protoId);
}
public static FunctionIdEnum getFunctionIdEnumById(int id) {
return functionIdEnumMap.get(id);
public static FunctionIdEnum getFunctionIdEnumByType(int functionType) {
return functionIdEnumMap.get(functionType);
}
}

View File

@ -1,7 +1,10 @@
package com.ljsd.jieling.core.function;
import com.ljsd.jieling.core.FunctionIdEnum;
import com.ljsd.jieling.core.FunctionManager;
import com.ljsd.jieling.core.GlobalsDef;
import com.ljsd.jieling.logic.activity.event.FunctionRefreshEvent;
import com.ljsd.jieling.logic.activity.event.Poster;
import com.ljsd.jieling.logic.arena.ArenaLogic;
import com.ljsd.jieling.logic.dao.TimeControllerOfFunction;
@ -16,10 +19,12 @@ public class ArenaFunction implements FunctionManager {
public void closeAction ()throws Exception {
ArenaLogic.getInstance().sendReward(GlobalsDef.ARENA_SEASON_REWARD);
ArenaLogic.getInstance().updateArenaSeason(0);
Poster.getPoster().dispatchEvent(new FunctionRefreshEvent(-FunctionIdEnum.Arena.getFunctionType(),-1));
}
@Override
public void startAction(TimeControllerOfFunction timeControllerOfFunction) {
ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes());
Poster.getPoster().dispatchEvent(new FunctionRefreshEvent(FunctionIdEnum.Arena.getFunctionType(),-1));
}
}

View File

@ -1,6 +1,9 @@
package com.ljsd.jieling.core.function;
import com.ljsd.jieling.core.FunctionIdEnum;
import com.ljsd.jieling.core.FunctionManager;
import com.ljsd.jieling.logic.activity.event.FunctionRefreshEvent;
import com.ljsd.jieling.logic.activity.event.Poster;
import com.ljsd.jieling.logic.championship.ChampionshipLogic;
import com.ljsd.jieling.logic.dao.TimeControllerOfFunction;
@ -8,6 +11,7 @@ public class ChampionFunction implements FunctionManager {
@Override
public void startAction(TimeControllerOfFunction timeControllerOfFunction) throws Exception {
ChampionshipLogic.start();
Poster.getPoster().dispatchEvent(new FunctionRefreshEvent(FunctionIdEnum.Arena.getFunctionType(),-1));
}
@Override

View File

@ -11,7 +11,7 @@ import com.ljsd.jieling.core.FunctionManager;
public class FunctionContext {
public static FunctionManager getFunction(int type){
return FunctionIdEnum.getFunctionIdEnumById(type).getManager();
return FunctionIdEnum.getFunctionIdEnumByType(type).getManager();
}
public static FunctionIdEnum getEnumByProto(int protoId){
return FunctionIdEnum.getFunctionIdEnumByProto(protoId);

View File

@ -181,4 +181,6 @@ public class GetPlayerInfoHandler extends BaseHandler{
e.printStackTrace();
}
}
}

View File

@ -9,17 +9,10 @@ import com.ljsd.jieling.core.FunctionManager;
import com.ljsd.jieling.core.function.FunctionContext;
import com.ljsd.jieling.db.mongo.MongoUtil;
import com.ljsd.jieling.handler.map.MapLogic;
import com.ljsd.jieling.logic.activity.ActivityLogic;
import com.ljsd.jieling.logic.activity.FightMainEventHandler;
import com.ljsd.jieling.logic.activity.RemoveEventHeroHandler;
import com.ljsd.jieling.logic.activity.UserLevelEventHandler;
import com.ljsd.jieling.logic.activity.event.HeroFiveStarGetEvent;
import com.ljsd.jieling.logic.activity.event.Poster;
import com.ljsd.jieling.logic.activity.*;
import com.ljsd.jieling.logic.activity.eventhandler.BuyGoodsDirectHandler;
import com.ljsd.jieling.logic.activity.eventhandler.HeroFiveStarGetEventHandler;
import com.ljsd.jieling.logic.arena.ArenaLogic;
import com.ljsd.jieling.logic.championship.ChampionshipLogic;
import com.ljsd.jieling.logic.dao.ExpeditionManager;
import com.ljsd.jieling.logic.dao.ServerConfig;
import com.ljsd.jieling.logic.dao.TimeControllerOfFunction;
import com.ljsd.jieling.logic.dao.root.GlobalSystemControl;
@ -192,7 +185,7 @@ public class GlobalDataManaager implements IManager {
public void openAction(List<Integer> ids) throws Exception {
for(Integer openId : ids){
int sameType = STableManager.getConfig(SGlobalSystemConfig.class).get(openId).getIsIDdSame();
FunctionIdEnum type = FunctionIdEnum.getFunctionIdEnumById(sameType);
FunctionIdEnum type = FunctionIdEnum.getFunctionIdEnumByType(sameType);
if(type == null){
continue;
}
@ -208,7 +201,7 @@ public class GlobalDataManaager implements IManager {
public void closeAction(List<Integer> ids) throws Exception {
for(Integer closeId : ids){
int sameType = STableManager.getConfig(SGlobalSystemConfig.class).get(closeId).getIsIDdSame();
// FunctionIdEnum type = FunctionIdEnum.getFunctionIdEnumById(sameType).g;
// FunctionIdEnum type = FunctionIdEnum.getFunctionIdEnumByType(sameType).g;
FunctionManager function = FunctionContext.getFunction(sameType);
if(function!=null){
function.closeAction();

View File

@ -73,7 +73,7 @@ public class ActivityLogic implements IEventHandler{
ActivityLogic.getInstance().resumeActivity(user, ActivityType.DAILY_RECHARGE);
//更新每日累计充值
ActivityLogic.getInstance().resumeActivity(user, ActivityType.RECHARGE_NUM);
//更新首日充值
//更新首日充值st
user.getPlayerInfoManager().getRechargeInfo().setDailyFirst(0);
//更新累计充值天数
ActivityLogic.getInstance().resumeActivity(user, ActivityType.RECHARGE_SUM_DAY);

View File

@ -2,9 +2,11 @@ package com.ljsd.jieling.logic.activity;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.core.FunctionIdEnum;
import com.ljsd.jieling.core.GlobalsDef;
import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.logic.activity.event.FightMainEvent;
import com.ljsd.jieling.logic.activity.event.FunctionRefreshEvent;
import com.ljsd.jieling.logic.activity.event.IEvent;
import com.ljsd.jieling.logic.activity.event.Poster;
import com.ljsd.jieling.logic.dao.ActivityMission;

View File

@ -0,0 +1,20 @@
package com.ljsd.jieling.logic.activity.event;
public class FunctionRefreshEvent implements IEvent{
private int functionType; // 系统刷新id 正数表示功能开启 负数表示功能关闭
private int invokeId ; // -1 表示系统 其他表示用户自身
public FunctionRefreshEvent(int functionId, int invokeId) {
this.functionType = functionId;
this.invokeId = invokeId;
}
public int getFunctionType() {
return functionType;
}
public int getInvokeId() {
return invokeId;
}
}

View File

@ -3,6 +3,7 @@ package com.ljsd.jieling.logic.dao;
import com.ljsd.common.mogodb.MongoBase;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import manager.STableManager;
import util.CellUtil;
import java.util.ArrayList;
import java.util.List;
@ -46,6 +47,16 @@ public class GuildMyInfo extends MongoBase {
if(path.size() <= 0){
return -1;
}
if(path.size() == 1 ){
Integer nextPath = path.get(0);
int x = (int) (Math.floor(nextPath / 25600) / 100);
int y = (nextPath - x * 25600 * 100) / 100;
int[] mine = CellUtil.pos2XY(curPos);
if(mine[0] == x && mine[1] == y){
curPos = path.remove(0);
return curPos;
}
}
int moveDistance = (int)((timestamp - preMoveTimestamp)/speed);
if(moveDistance < 1){
//格子没有发生变化

View File

@ -875,12 +875,13 @@ public class GuildLogic {
user.getGuildMyInfo().move(System.currentTimeMillis());
GuildMyInfo guildMyInfo = user.getGuildMyInfo();
LOGGER.info("cur ={},path={}",guildMyInfo.getCurPos(),path);
boolean continuous = CellUtil.isContinuous(guildMyInfo.getCurPos(),path);
/* boolean continuous = CellUtil.isContinuous(guildMyInfo.getCurPos(),path);
if(!continuous){
LOGGER.info("the uid={},path is wrong",uid);
MessageUtil.sendMessage(session,1, msgId,null,true);
return;
}
}*/
user.getGuildMyInfo().move(path);
Family.FamilyWalkIndicaiton familyWalkIndicaiton = CBean2Proto.getFamilyWalkIndicaiton(user);
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(guildId);

View File

@ -1,6 +1,8 @@
package com.ljsd.jieling.logic.store;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.core.FunctionIdEnum;
import com.ljsd.jieling.core.HandlerLogicThread;
import com.ljsd.jieling.db.mongo.MongoUtil;
import com.ljsd.jieling.exception.ErrorCode;
import com.ljsd.jieling.exception.ErrorCodeException;
@ -8,10 +10,12 @@ import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.globals.Global;
import com.ljsd.jieling.ktbeans.KtEventUtils;
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
import com.ljsd.jieling.logic.GlobalDataManaager;
import com.ljsd.jieling.logic.OnlineUserManager;
import com.ljsd.jieling.logic.activity.ActivityLogic;
import com.ljsd.jieling.logic.activity.ActivityType;
import com.ljsd.jieling.logic.activity.event.GoldEvent;
import com.ljsd.jieling.logic.activity.event.Poster;
import com.ljsd.jieling.logic.activity.IEventHandler;
import com.ljsd.jieling.logic.activity.event.*;
import com.ljsd.jieling.logic.dao.*;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.mail.MailLogic;
@ -35,17 +39,29 @@ import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
public class StoreLogic {
public class StoreLogic implements IEventHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(StoreLogic.class);
private static Set<Integer> openStoreInfo = new HashSet<>();
private static Set<Integer> storeGiftType = new HashSet<>(3);
private StoreLogic(){
Poster.getPoster().listenEvent(this, FunctionRefreshEvent.class);
}
public static class Instance {
public final static StoreLogic instance = new StoreLogic();
}
public static StoreLogic getInstance() {
return StoreLogic.Instance.instance;
}
static {
storeGiftType.add(30);
storeGiftType.add(31);
storeGiftType.add(32);
StoreLogic.getInstance();
}
public static void checkGlobalStore(boolean isStartServer) throws Exception {
@ -300,6 +316,16 @@ public class StoreLogic {
Map<Integer, SStoreTypeConfig> sstoreTypeConfigMap = SStoreTypeConfig.getsStoreTypeConfigMap();
for ( Map.Entry<Integer, SStoreTypeConfig> entry :sstoreTypeConfigMap.entrySet()){
SStoreTypeConfig sStoreTypeConfig = entry.getValue();
if(sStoreTypeConfig.getStoreOpenRule() == 8){
TimeControllerOfFunction openTimeOfFuntionCacheByType = GlobalDataManaager.getInstance().getOpenTimeOfFuntionCacheByType(FunctionIdEnum.getFunctionIdEnumByType(sStoreTypeConfig.getOpenLevel()[1]));
if(openTimeOfFuntionCacheByType!=null ){
StoreInfo storeInfo = storeManager.getStoreInfoMap().get(sStoreTypeConfig.getId());
if(storeInfo == null || storeInfo.getStartTime()!=openTimeOfFuntionCacheByType.getStartTime()){
Map<Integer, Integer> itemNumMap = getStoreItem(sStoreTypeConfig.getId(),sStoreTypeConfig,user);
storeManager.newStoreInfo(sStoreTypeConfig.getId(),openTimeOfFuntionCacheByType.getStartTime(),openTimeOfFuntionCacheByType.getEndTime(),itemNumMap);
}
}
}
if(storeManager.getStoreInfoMap().containsKey(sStoreTypeConfig.getId())){
continue;
}
@ -315,6 +341,7 @@ public class StoreLogic {
}
storeManager.newStoreInfo(sStoreTypeConfig.getId(),startTime,endTime,itemNumMap);
}
}
}
@ -656,5 +683,38 @@ public class StoreLogic {
MessageUtil.sendMessage(session, 1,msgId, null, true);
}
public static void checkAllowOfFunction(FunctionRefreshEvent functionRefreshEvent) throws Exception {
if(functionRefreshEvent.getInvokeId()!=-1){
return;
}
int functionType = functionRefreshEvent.getFunctionType();
if(functionType>0){
List<Integer> openStoreIds = SStoreTypeConfig .storeIdsByFuntionIdMap.get(functionType);
if(openStoreIds.isEmpty()){
return;
}
for(ISession session : OnlineUserManager.sessionMap.values()){
User user = UserManager.getUser(session.getUid());
AyyncWorker ayyncWorker = new AyyncWorker(user, true,userCache-> {
for(Integer openStoreId : openStoreIds){
TimeControllerOfFunction openTimeOfFuntionCacheByType = GlobalDataManaager.getInstance().getOpenTimeOfFuntionCacheByType(FunctionIdEnum.getFunctionIdEnumByType(functionType));
if(openTimeOfFuntionCacheByType!=null){
initOnsStoereWithTime(user,openStoreId,openTimeOfFuntionCacheByType.getStartTime(),openTimeOfFuntionCacheByType.getEndTime());
}
}
});
ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker);
}
}
}
@Override
public void onEvent(IEvent event) throws Exception {
if(!(event instanceof FunctionRefreshEvent)){
return;
}
checkAllowOfFunction((FunctionRefreshEvent)event);
}
}

View File

@ -4,11 +4,15 @@ import manager.STableManager;
import manager.Table;
import util.TimeUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Table(name ="StoreTypeConfig")
public class SStoreTypeConfig implements BaseConfig {
static Map<Integer, SStoreTypeConfig> sStoreTypeConfigMap;
public static Map<Integer, List<Integer>> storeIdsByFuntionIdMap;
private int id;
private int number;
private int[][] refreshItem;
@ -31,14 +35,22 @@ public class SStoreTypeConfig implements BaseConfig {
private long endTimeLong;
private int[] openLevel;
@Override
public void init() throws Exception {
Map<Integer, SStoreTypeConfig> config = STableManager.getConfig(SStoreTypeConfig.class);
Map<Integer, List<Integer>> storeIdByFunctionMapTmp = new HashMap<>();
for(SStoreTypeConfig sStoreTypeConfig : config.values()){
int time = sStoreTypeConfig.getStoreOpenRule();
String startTime = sStoreTypeConfig.getStartTime();
String endtime = sStoreTypeConfig.getEndTime();
if(time == 8 && sStoreTypeConfig.getOpenLevel().length>0 && sStoreTypeConfig.getOpenLevel()[0] == 3){
if(!storeIdByFunctionMapTmp.containsKey(sStoreTypeConfig.getOpenLevel()[1])){
storeIdByFunctionMapTmp.put(sStoreTypeConfig.getOpenLevel()[1],new ArrayList<>());
}
storeIdByFunctionMapTmp.get(sStoreTypeConfig.getOpenLevel()[1]).add(sStoreTypeConfig.getId());
}
if(time == 1 ){//ActivityType.OPEN_TYPE_TIME
if (!sStoreTypeConfig.getStartTime().equals("0")){
sStoreTypeConfig.setStartTimeLong(TimeUtils.parseTimeToMiles(sStoreTypeConfig.getStartTime(), TimeUtils.Stand_CeHua_Data_format));
@ -53,6 +65,7 @@ public class SStoreTypeConfig implements BaseConfig {
sStoreTypeConfig.setEndTimeLong(Long.parseLong(endtime)*60);
}
sStoreTypeConfigMap=config;
storeIdsByFuntionIdMap=storeIdByFunctionMapTmp;
}
public static Map<Integer, SStoreTypeConfig> getsStoreTypeConfigMap() {
@ -113,4 +126,8 @@ public class SStoreTypeConfig implements BaseConfig {
public long getEndTimeLong() {
return endTimeLong;
}
public int[] getOpenLevel() {
return openLevel;
}
}