change classloader

back_recharge
wangyuan 2019-10-14 15:30:13 +08:00
parent c70b7b17ef
commit 94ac2788df
51 changed files with 2945 additions and 342 deletions

View File

@ -54,7 +54,7 @@ public class BattleServerApplication {
new BloodyRetrySendIndicationThread("retry-indication").start();
BloodyProtocolsManager protocolsManager = BloodyProtocolsManager.getInstance();
Map<String, BaseHandler> gameHanderMap = configurableApplicationContext.getBeansOfType(BaseHandler.class);
STableManager.initialize("com.ljsd.jieling.config");
STableManager.initialize(GameApplication.class.getClassLoader(),"com.ljsd.jieling.config");
SceneManager.initMap();
for (BaseHandler handler : gameHanderMap.values()) {
protocolsManager.addHandler(handler);

View File

@ -1,6 +1,5 @@
package com.ljsd.battle.actor;
import com.google.gson.Gson;
import com.ljsd.battle.room.BeanToProto;
import com.ljsd.battle.room.Command;
import com.ljsd.battle.room.SceneManager;

View File

@ -76691,6 +76691,796 @@ public final class CommonProto {
// @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.LuckWheelRewardPosInfo)
}
public interface RefreshTaskOrBuilder
extends com.google.protobuf.MessageOrBuilder {
// optional int32 type = 1;
/**
* <code>optional int32 type = 1;</code>
*
* <pre>
* 1 2 3
* </pre>
*/
boolean hasType();
/**
* <code>optional int32 type = 1;</code>
*
* <pre>
* 1 2 3
* </pre>
*/
int getType();
// repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
java.util.List<com.ljsd.jieling.protocols.CommonProto.UserMissionInfo>
getTasksList();
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
com.ljsd.jieling.protocols.CommonProto.UserMissionInfo getTasks(int index);
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
int getTasksCount();
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
java.util.List<? extends com.ljsd.jieling.protocols.CommonProto.UserMissionInfoOrBuilder>
getTasksOrBuilderList();
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
com.ljsd.jieling.protocols.CommonProto.UserMissionInfoOrBuilder getTasksOrBuilder(
int index);
}
/**
* Protobuf type {@code com.ljsd.jieling.protocols.RefreshTask}
*/
public static final class RefreshTask extends
com.google.protobuf.GeneratedMessage
implements RefreshTaskOrBuilder {
// Use RefreshTask.newBuilder() to construct.
private RefreshTask(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
private RefreshTask(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final RefreshTask defaultInstance;
public static RefreshTask getDefaultInstance() {
return defaultInstance;
}
public RefreshTask getDefaultInstanceForType() {
return defaultInstance;
}
private final com.google.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
public final com.google.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private RefreshTask(
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;
type_ = input.readInt32();
break;
}
case 18: {
if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
tasks_ = new java.util.ArrayList<com.ljsd.jieling.protocols.CommonProto.UserMissionInfo>();
mutable_bitField0_ |= 0x00000002;
}
tasks_.add(input.readMessage(com.ljsd.jieling.protocols.CommonProto.UserMissionInfo.PARSER, extensionRegistry));
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
throw new com.google.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
tasks_ = java.util.Collections.unmodifiableList(tasks_);
}
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_RefreshTask_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_RefreshTask_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.ljsd.jieling.protocols.CommonProto.RefreshTask.class, com.ljsd.jieling.protocols.CommonProto.RefreshTask.Builder.class);
}
public static com.google.protobuf.Parser<RefreshTask> PARSER =
new com.google.protobuf.AbstractParser<RefreshTask>() {
public RefreshTask parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return new RefreshTask(input, extensionRegistry);
}
};
@java.lang.Override
public com.google.protobuf.Parser<RefreshTask> getParserForType() {
return PARSER;
}
private int bitField0_;
// optional int32 type = 1;
public static final int TYPE_FIELD_NUMBER = 1;
private int type_;
/**
* <code>optional int32 type = 1;</code>
*
* <pre>
* 1 2 3
* </pre>
*/
public boolean hasType() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>optional int32 type = 1;</code>
*
* <pre>
* 1 2 3
* </pre>
*/
public int getType() {
return type_;
}
// repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;
public static final int TASKS_FIELD_NUMBER = 2;
private java.util.List<com.ljsd.jieling.protocols.CommonProto.UserMissionInfo> tasks_;
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public java.util.List<com.ljsd.jieling.protocols.CommonProto.UserMissionInfo> getTasksList() {
return tasks_;
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public java.util.List<? extends com.ljsd.jieling.protocols.CommonProto.UserMissionInfoOrBuilder>
getTasksOrBuilderList() {
return tasks_;
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public int getTasksCount() {
return tasks_.size();
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public com.ljsd.jieling.protocols.CommonProto.UserMissionInfo getTasks(int index) {
return tasks_.get(index);
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public com.ljsd.jieling.protocols.CommonProto.UserMissionInfoOrBuilder getTasksOrBuilder(
int index) {
return tasks_.get(index);
}
private void initFields() {
type_ = 0;
tasks_ = java.util.Collections.emptyList();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1;
memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeInt32(1, type_);
}
for (int i = 0; i < tasks_.size(); i++) {
output.writeMessage(2, tasks_.get(i));
}
getUnknownFields().writeTo(output);
}
private int memoizedSerializedSize = -1;
public int getSerializedSize() {
int size = memoizedSerializedSize;
if (size != -1) return size;
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(1, type_);
}
for (int i = 0; i < tasks_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(2, tasks_.get(i));
}
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.RefreshTask parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.ljsd.jieling.protocols.CommonProto.RefreshTask 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.RefreshTask parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.ljsd.jieling.protocols.CommonProto.RefreshTask 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.RefreshTask parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.ljsd.jieling.protocols.CommonProto.RefreshTask 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.RefreshTask parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
public static com.ljsd.jieling.protocols.CommonProto.RefreshTask 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.RefreshTask parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.ljsd.jieling.protocols.CommonProto.RefreshTask 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.RefreshTask 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.RefreshTask}
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder<Builder>
implements com.ljsd.jieling.protocols.CommonProto.RefreshTaskOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_RefreshTask_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_RefreshTask_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.ljsd.jieling.protocols.CommonProto.RefreshTask.class, com.ljsd.jieling.protocols.CommonProto.RefreshTask.Builder.class);
}
// Construct using com.ljsd.jieling.protocols.CommonProto.RefreshTask.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
private Builder(
com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getTasksFieldBuilder();
}
}
private static Builder create() {
return new Builder();
}
public Builder clear() {
super.clear();
type_ = 0;
bitField0_ = (bitField0_ & ~0x00000001);
if (tasksBuilder_ == null) {
tasks_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000002);
} else {
tasksBuilder_.clear();
}
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_RefreshTask_descriptor;
}
public com.ljsd.jieling.protocols.CommonProto.RefreshTask getDefaultInstanceForType() {
return com.ljsd.jieling.protocols.CommonProto.RefreshTask.getDefaultInstance();
}
public com.ljsd.jieling.protocols.CommonProto.RefreshTask build() {
com.ljsd.jieling.protocols.CommonProto.RefreshTask result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
public com.ljsd.jieling.protocols.CommonProto.RefreshTask buildPartial() {
com.ljsd.jieling.protocols.CommonProto.RefreshTask result = new com.ljsd.jieling.protocols.CommonProto.RefreshTask(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
to_bitField0_ |= 0x00000001;
}
result.type_ = type_;
if (tasksBuilder_ == null) {
if (((bitField0_ & 0x00000002) == 0x00000002)) {
tasks_ = java.util.Collections.unmodifiableList(tasks_);
bitField0_ = (bitField0_ & ~0x00000002);
}
result.tasks_ = tasks_;
} else {
result.tasks_ = tasksBuilder_.build();
}
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof com.ljsd.jieling.protocols.CommonProto.RefreshTask) {
return mergeFrom((com.ljsd.jieling.protocols.CommonProto.RefreshTask)other);
} else {
super.mergeFrom(other);
return this;
}
}
public Builder mergeFrom(com.ljsd.jieling.protocols.CommonProto.RefreshTask other) {
if (other == com.ljsd.jieling.protocols.CommonProto.RefreshTask.getDefaultInstance()) return this;
if (other.hasType()) {
setType(other.getType());
}
if (tasksBuilder_ == null) {
if (!other.tasks_.isEmpty()) {
if (tasks_.isEmpty()) {
tasks_ = other.tasks_;
bitField0_ = (bitField0_ & ~0x00000002);
} else {
ensureTasksIsMutable();
tasks_.addAll(other.tasks_);
}
onChanged();
}
} else {
if (!other.tasks_.isEmpty()) {
if (tasksBuilder_.isEmpty()) {
tasksBuilder_.dispose();
tasksBuilder_ = null;
tasks_ = other.tasks_;
bitField0_ = (bitField0_ & ~0x00000002);
tasksBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
getTasksFieldBuilder() : null;
} else {
tasksBuilder_.addAllMessages(other.tasks_);
}
}
}
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.RefreshTask parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.ljsd.jieling.protocols.CommonProto.RefreshTask) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
mergeFrom(parsedMessage);
}
}
return this;
}
private int bitField0_;
// optional int32 type = 1;
private int type_ ;
/**
* <code>optional int32 type = 1;</code>
*
* <pre>
* 1 2 3
* </pre>
*/
public boolean hasType() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>optional int32 type = 1;</code>
*
* <pre>
* 1 2 3
* </pre>
*/
public int getType() {
return type_;
}
/**
* <code>optional int32 type = 1;</code>
*
* <pre>
* 1 2 3
* </pre>
*/
public Builder setType(int value) {
bitField0_ |= 0x00000001;
type_ = value;
onChanged();
return this;
}
/**
* <code>optional int32 type = 1;</code>
*
* <pre>
* 1 2 3
* </pre>
*/
public Builder clearType() {
bitField0_ = (bitField0_ & ~0x00000001);
type_ = 0;
onChanged();
return this;
}
// repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;
private java.util.List<com.ljsd.jieling.protocols.CommonProto.UserMissionInfo> tasks_ =
java.util.Collections.emptyList();
private void ensureTasksIsMutable() {
if (!((bitField0_ & 0x00000002) == 0x00000002)) {
tasks_ = new java.util.ArrayList<com.ljsd.jieling.protocols.CommonProto.UserMissionInfo>(tasks_);
bitField0_ |= 0x00000002;
}
}
private com.google.protobuf.RepeatedFieldBuilder<
com.ljsd.jieling.protocols.CommonProto.UserMissionInfo, com.ljsd.jieling.protocols.CommonProto.UserMissionInfo.Builder, com.ljsd.jieling.protocols.CommonProto.UserMissionInfoOrBuilder> tasksBuilder_;
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public java.util.List<com.ljsd.jieling.protocols.CommonProto.UserMissionInfo> getTasksList() {
if (tasksBuilder_ == null) {
return java.util.Collections.unmodifiableList(tasks_);
} else {
return tasksBuilder_.getMessageList();
}
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public int getTasksCount() {
if (tasksBuilder_ == null) {
return tasks_.size();
} else {
return tasksBuilder_.getCount();
}
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public com.ljsd.jieling.protocols.CommonProto.UserMissionInfo getTasks(int index) {
if (tasksBuilder_ == null) {
return tasks_.get(index);
} else {
return tasksBuilder_.getMessage(index);
}
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public Builder setTasks(
int index, com.ljsd.jieling.protocols.CommonProto.UserMissionInfo value) {
if (tasksBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
ensureTasksIsMutable();
tasks_.set(index, value);
onChanged();
} else {
tasksBuilder_.setMessage(index, value);
}
return this;
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public Builder setTasks(
int index, com.ljsd.jieling.protocols.CommonProto.UserMissionInfo.Builder builderForValue) {
if (tasksBuilder_ == null) {
ensureTasksIsMutable();
tasks_.set(index, builderForValue.build());
onChanged();
} else {
tasksBuilder_.setMessage(index, builderForValue.build());
}
return this;
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public Builder addTasks(com.ljsd.jieling.protocols.CommonProto.UserMissionInfo value) {
if (tasksBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
ensureTasksIsMutable();
tasks_.add(value);
onChanged();
} else {
tasksBuilder_.addMessage(value);
}
return this;
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public Builder addTasks(
int index, com.ljsd.jieling.protocols.CommonProto.UserMissionInfo value) {
if (tasksBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
ensureTasksIsMutable();
tasks_.add(index, value);
onChanged();
} else {
tasksBuilder_.addMessage(index, value);
}
return this;
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public Builder addTasks(
com.ljsd.jieling.protocols.CommonProto.UserMissionInfo.Builder builderForValue) {
if (tasksBuilder_ == null) {
ensureTasksIsMutable();
tasks_.add(builderForValue.build());
onChanged();
} else {
tasksBuilder_.addMessage(builderForValue.build());
}
return this;
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public Builder addTasks(
int index, com.ljsd.jieling.protocols.CommonProto.UserMissionInfo.Builder builderForValue) {
if (tasksBuilder_ == null) {
ensureTasksIsMutable();
tasks_.add(index, builderForValue.build());
onChanged();
} else {
tasksBuilder_.addMessage(index, builderForValue.build());
}
return this;
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public Builder addAllTasks(
java.lang.Iterable<? extends com.ljsd.jieling.protocols.CommonProto.UserMissionInfo> values) {
if (tasksBuilder_ == null) {
ensureTasksIsMutable();
super.addAll(values, tasks_);
onChanged();
} else {
tasksBuilder_.addAllMessages(values);
}
return this;
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public Builder clearTasks() {
if (tasksBuilder_ == null) {
tasks_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000002);
onChanged();
} else {
tasksBuilder_.clear();
}
return this;
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public Builder removeTasks(int index) {
if (tasksBuilder_ == null) {
ensureTasksIsMutable();
tasks_.remove(index);
onChanged();
} else {
tasksBuilder_.remove(index);
}
return this;
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public com.ljsd.jieling.protocols.CommonProto.UserMissionInfo.Builder getTasksBuilder(
int index) {
return getTasksFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public com.ljsd.jieling.protocols.CommonProto.UserMissionInfoOrBuilder getTasksOrBuilder(
int index) {
if (tasksBuilder_ == null) {
return tasks_.get(index); } else {
return tasksBuilder_.getMessageOrBuilder(index);
}
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public java.util.List<? extends com.ljsd.jieling.protocols.CommonProto.UserMissionInfoOrBuilder>
getTasksOrBuilderList() {
if (tasksBuilder_ != null) {
return tasksBuilder_.getMessageOrBuilderList();
} else {
return java.util.Collections.unmodifiableList(tasks_);
}
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public com.ljsd.jieling.protocols.CommonProto.UserMissionInfo.Builder addTasksBuilder() {
return getTasksFieldBuilder().addBuilder(
com.ljsd.jieling.protocols.CommonProto.UserMissionInfo.getDefaultInstance());
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public com.ljsd.jieling.protocols.CommonProto.UserMissionInfo.Builder addTasksBuilder(
int index) {
return getTasksFieldBuilder().addBuilder(
index, com.ljsd.jieling.protocols.CommonProto.UserMissionInfo.getDefaultInstance());
}
/**
* <code>repeated .com.ljsd.jieling.protocols.UserMissionInfo tasks = 2;</code>
*/
public java.util.List<com.ljsd.jieling.protocols.CommonProto.UserMissionInfo.Builder>
getTasksBuilderList() {
return getTasksFieldBuilder().getBuilderList();
}
private com.google.protobuf.RepeatedFieldBuilder<
com.ljsd.jieling.protocols.CommonProto.UserMissionInfo, com.ljsd.jieling.protocols.CommonProto.UserMissionInfo.Builder, com.ljsd.jieling.protocols.CommonProto.UserMissionInfoOrBuilder>
getTasksFieldBuilder() {
if (tasksBuilder_ == null) {
tasksBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
com.ljsd.jieling.protocols.CommonProto.UserMissionInfo, com.ljsd.jieling.protocols.CommonProto.UserMissionInfo.Builder, com.ljsd.jieling.protocols.CommonProto.UserMissionInfoOrBuilder>(
tasks_,
((bitField0_ & 0x00000002) == 0x00000002),
getParentForChildren(),
isClean());
tasks_ = null;
}
return tasksBuilder_;
}
// @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.RefreshTask)
}
static {
defaultInstance = new RefreshTask(true);
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.RefreshTask)
}
public interface MainLevelRankInfoOrBuilder
extends com.google.protobuf.MessageOrBuilder {
@ -78191,6 +78981,11 @@ public final class CommonProto {
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_ljsd_jieling_protocols_LuckWheelRewardPosInfo_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
internal_static_com_ljsd_jieling_protocols_RefreshTask_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_ljsd_jieling_protocols_RefreshTask_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
internal_static_com_ljsd_jieling_protocols_MainLevelRankInfo_descriptor;
private static
@ -78430,10 +79225,13 @@ public final class CommonProto {
" \001(\005\022\r\n\005level\030\006 \001(\005\022\014\n\004rank\030\007 \001(\005\022\r\n\005sco" +
"re\030\010 \001(\005\"H\n\026LuckWheelRewardPosInfo\022\013\n\003po" +
"s\030\001 \001(\005\022\016\n\006luckId\030\002 \001(\005\022\021\n\tluckTimes\030\003 \001" +
"(\005\"\221\001\n\021MainLevelRankInfo\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\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\ntotal" +
"Force\030\007 \001(\005\022\021\n\theadFrame\030\010 \001(\005B\002H\001"
"(\005\"W\n\013RefreshTask\022\014\n\004type\030\001 \001(\005\022:\n\005tasks" +
"\030\002 \003(\0132+.com.ljsd.jieling.protocols.User" +
"MissionInfo\"\221\001\n\021MainLevelRankInfo\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\017\n\007f" +
"ightId\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(\005B" +
"\002H\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -78956,8 +79754,14 @@ public final class CommonProto {
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_LuckWheelRewardPosInfo_descriptor,
new java.lang.String[] { "Pos", "LuckId", "LuckTimes", });
internal_static_com_ljsd_jieling_protocols_MainLevelRankInfo_descriptor =
internal_static_com_ljsd_jieling_protocols_RefreshTask_descriptor =
getDescriptor().getMessageTypes().get(85);
internal_static_com_ljsd_jieling_protocols_RefreshTask_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_RefreshTask_descriptor,
new java.lang.String[] { "Type", "Tasks", });
internal_static_com_ljsd_jieling_protocols_MainLevelRankInfo_descriptor =
getDescriptor().getMessageTypes().get(86);
internal_static_com_ljsd_jieling_protocols_MainLevelRankInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_MainLevelRankInfo_descriptor,

View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.config.classsStaticCfg;
package com.ljsd.jieling.config.clazzStaticCfg;
import com.ljsd.jieling.logic.activity.ActivityType;
import config.SActivityRewardConfig;

View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.config.classsStaticCfg;
package com.ljsd.jieling.config.clazzStaticCfg;
import com.ljsd.GameApplication;
import com.ljsd.jieling.globals.Global;

View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.config.classsStaticCfg;
package com.ljsd.jieling.config.clazzStaticCfg;
import com.ljsd.jieling.core.GlobalsDef;
import config.SCHeroRankUpConfig;

View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.config.classsStaticCfg;
package com.ljsd.jieling.config.clazzStaticCfg;
import com.ljsd.jieling.util.ItemUtil;
import config.SRewardGroup;

View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.config.classsStaticCfg;
package com.ljsd.jieling.config.clazzStaticCfg;
import com.ljsd.jieling.db.mongo.MongoUtil;
import com.ljsd.jieling.protocols.CommonProto;

View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.config.classsStaticCfg;
package com.ljsd.jieling.config.clazzStaticCfg;
import com.ljsd.jieling.logic.mission.MissionType;
import config.STreasureTaskConfig;

View File

@ -1,7 +1,7 @@
package com.ljsd.jieling.handler.GameGM;
import com.ljsd.GameApplication;
import com.ljsd.jieling.config.classsStaticCfg.HeroStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.HeroStaticConfig;
import com.ljsd.jieling.core.GlobalsDef;
import com.ljsd.jieling.db.redis.RedisKey;
import com.ljsd.jieling.db.redis.RedisUtil;

View File

@ -1,6 +1,6 @@
package com.ljsd.jieling.handler;
import com.ljsd.jieling.config.classsStaticCfg.HeroStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.HeroStaticConfig;
import com.ljsd.jieling.db.mongo.MongoUtil;
import com.ljsd.jieling.db.redis.RedisKey;
import com.ljsd.jieling.db.redis.RedisUtil;
@ -26,7 +26,6 @@ import com.ljsd.jieling.thread.task.RPCServerTask;
import com.ljsd.jieling.util.CBean2Proto;
import com.ljsd.jieling.util.MessageUtil;
import config.SChallengeConfig;
import config.SLotterySetting;
import config.SRechargeCommodityConfig;
import manager.STableManager;
import org.slf4j.Logger;

View File

@ -1,8 +1,8 @@
package com.ljsd.jieling.handler.map;
import com.googlecode.protobuf.format.JsonFormat;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.classsStaticCfg.MapStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.MapStaticConfig;
import com.ljsd.jieling.core.FunctionIdEnum;
import com.ljsd.jieling.core.VipPrivilegeType;
import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType;

View File

@ -2,7 +2,7 @@ package com.ljsd.jieling.handler.map;
import com.ljsd.common.mogodb.MongoBase;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.core.GlobalsDef;
import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.globals.Global;

View File

@ -1,7 +1,7 @@
package com.ljsd.jieling.kefu;
import com.google.gson.Gson;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.core.FunctionIdEnum;
import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType;
import com.ljsd.jieling.dataReport.reportBeans_37.Repot37EventUtil;

View File

@ -1,7 +1,7 @@
package com.ljsd.jieling.logic;
import com.ljsd.GameApplication;
import com.ljsd.jieling.config.classsStaticCfg.MapStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.MapStaticConfig;
import com.ljsd.jieling.config.json.KTSDKConstans;
import com.ljsd.jieling.config.json.ServerProperties;
import com.ljsd.jieling.core.FunctionIdEnum;
@ -99,6 +99,10 @@ public class GlobalDataManaager {
long passTims = now - seasonOpenLong;
if(passTims>0){
if(diffTime + seasonInterval == 0){
LOGGER.info("the sGlobalSystemConfig info{},{}",sGlobalSystemConfig.getId(),sGlobalSystemConfig.getSeasonInterval());
}
long mod = passTims % (diffTime + seasonInterval);
if(mod < diffTime ){//新的周期开启
openList.add(id);

View File

@ -1,7 +1,7 @@
package com.ljsd.jieling.logic.activity;
import com.ljsd.GameApplication;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.core.VipPrivilegeType;
import com.ljsd.jieling.db.redis.RedisKey;
import com.ljsd.jieling.db.redis.RedisUtil;

View File

@ -1,7 +1,6 @@
package com.ljsd.jieling.logic.activity;
import com.ljsd.jieling.config.*;
import com.ljsd.jieling.config.classsStaticCfg.TaskStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.TaskStaticConfig;
import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.globals.Global;
import com.ljsd.jieling.logic.dao.ActivityMission;

View File

@ -5,7 +5,6 @@ import config.SActivityRewardConfig;
import config.SEquipConfig;
import com.ljsd.jieling.logic.OnlineUserManager;
import com.ljsd.jieling.logic.activity.event.EquipEvent;
import com.ljsd.jieling.logic.activity.event.HeroUpStarEvent;
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

@ -1,7 +1,7 @@
package com.ljsd.jieling.logic.activity;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.logic.activity.event.FightMainEvent;
import com.ljsd.jieling.logic.activity.event.IEvent;

View File

@ -1,6 +1,6 @@
package com.ljsd.jieling.logic.activity;
import com.ljsd.jieling.config.classsStaticCfg.ActivityStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.ActivityStaticConfig;
import com.ljsd.jieling.logic.dao.ActivityManager;
import com.ljsd.jieling.logic.dao.ActivityMission;
import com.ljsd.jieling.logic.dao.ActivityProgressInfo;

View File

@ -1,6 +1,6 @@
package com.ljsd.jieling.logic.activity;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.logic.activity.event.IEvent;
import com.ljsd.jieling.logic.activity.event.Poster;

View File

@ -66,7 +66,7 @@ public class FriendManager extends MongoBase {
}
public void setBlackFriends(List<Integer> blackFriends) {
updateString("blackFriends", friends);
updateString("blackFriends", blackFriends);
this.blackFriends = blackFriends;
}

View File

@ -1,7 +1,7 @@
package com.ljsd.jieling.logic.dao;
import com.ljsd.common.mogodb.MongoBase;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import manager.STableManager;
import java.util.ArrayList;

View File

@ -1,7 +1,7 @@
package com.ljsd.jieling.logic.dao;
import com.ljsd.common.mogodb.MongoBase;
import com.ljsd.jieling.config.classsStaticCfg.HeroStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.HeroStaticConfig;
import com.ljsd.jieling.core.GlobalsDef;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.mission.GameEvent;

View File

@ -1,7 +1,7 @@
package com.ljsd.jieling.logic.dao;
import com.ljsd.common.mogodb.MongoBase;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import config.SGameSetting;
import manager.STableManager;

View File

@ -1,7 +1,7 @@
package com.ljsd.jieling.logic.dao;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.db.mongo.MongoUtil;
import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.ktbeans.KtEventUtils;

View File

@ -1,12 +1,11 @@
package com.ljsd.jieling.logic.dao;
import com.ljsd.common.mogodb.MongoBase;
import com.ljsd.jieling.config.classsStaticCfg.TaskStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.TaskStaticConfig;
import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.globals.Global;
import com.ljsd.jieling.logic.OnlineUserManager;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.item.ItemLogic;
import com.ljsd.jieling.logic.mission.*;
import com.ljsd.jieling.logic.mission.event.MissionEventDistributor;
import com.ljsd.jieling.logic.mission.main.*;

View File

@ -1,6 +1,6 @@
package com.ljsd.jieling.logic.fight;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.core.GlobalsDef;
import com.ljsd.jieling.core.VipPrivilegeType;
import com.ljsd.jieling.db.mongo.MongoUtil;

View File

@ -1,6 +1,6 @@
package com.ljsd.jieling.logic.friend;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.core.HandlerLogicThread;
import com.ljsd.jieling.db.mongo.MongoUtil;
import com.ljsd.jieling.db.redis.RedisKey;

View File

@ -2,8 +2,8 @@ package com.ljsd.jieling.logic.hero;
import com.ljsd.GameApplication;
import com.ljsd.jieling.chat.logic.ChatLogic;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.classsStaticCfg.HeroStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.HeroStaticConfig;
import com.ljsd.jieling.core.GlobalsDef;
import com.ljsd.jieling.core.HandlerLogicThread;
import com.ljsd.jieling.core.VipPrivilegeType;

View File

@ -1,7 +1,7 @@
package com.ljsd.jieling.logic.item;
import com.ljsd.jieling.chat.logic.ChatLogic;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.globals.Global;
import com.ljsd.jieling.handler.map.MapManager;

View File

@ -1,7 +1,7 @@
package com.ljsd.jieling.logic.item;
import com.ljsd.jieling.chat.logic.ChatLogic;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.core.FunctionIdEnum;
import com.ljsd.jieling.core.GlobalsDef;
import com.ljsd.jieling.core.HandlerLogicThread;

View File

@ -1,8 +1,7 @@
package com.ljsd.jieling.logic.mission;
import com.ljsd.jieling.config.*;
import com.ljsd.jieling.config.classsStaticCfg.TaskStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.TaskStaticConfig;
import com.ljsd.jieling.dataReport.reportBeans_37.Repot37EventUtil;
import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.handler.map.CrossInfo;

View File

@ -1,6 +1,6 @@
package com.ljsd.jieling.logic.mission.main;
import com.ljsd.jieling.config.classsStaticCfg.TaskStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.TaskStaticConfig;
import com.ljsd.jieling.logic.dao.CumulationData;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.mission.MissionLoigc;

View File

@ -1,8 +1,8 @@
package com.ljsd.jieling.logic.player;
import com.ljsd.GameApplication;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.classsStaticCfg.TaskStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.TaskStaticConfig;
import com.ljsd.jieling.core.VipPrivilegeType;
import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType;
import com.ljsd.jieling.dataReport.reportBeans_37.Repot37EventUtil;

View File

@ -1,8 +1,6 @@
package com.ljsd.jieling.logic.store;
import com.ljsd.common.mogodb.MongoUpdateCache;
import com.ljsd.common.mogodb.MongoUpdateCacheThreadLocal;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.db.mongo.MongoUtil;
import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.globals.Global;
@ -29,7 +27,6 @@ import org.slf4j.LoggerFactory;
import util.StringUtil;
import util.TimeUtils;
import java.lang.reflect.Field;
import java.util.*;
/**

View File

@ -1,6 +1,6 @@
package com.ljsd.jieling.logic.store;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.core.HandlerLogicThread;
import com.ljsd.jieling.db.mongo.MongoUtil;
import com.ljsd.jieling.globals.BIReason;

View File

@ -1,6 +1,6 @@
package com.ljsd.jieling.util;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.db.redis.RedisKey;
import com.ljsd.jieling.db.redis.RedisUtil;
import com.ljsd.jieling.globals.Global;

View File

@ -1,8 +1,8 @@
package com.ljsd.jieling.util;
import com.ljsd.jieling.chat.logic.ChatLogic;
import com.ljsd.jieling.config.classsStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.classsStaticCfg.MapStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.MapStaticConfig;
import com.ljsd.jieling.core.GlobalsDef;
import com.ljsd.jieling.core.VipPrivilegeType;
import com.ljsd.jieling.dataReport.reportBeans_37.Repot37EventUtil;

View File

@ -1,6 +1,6 @@
package com.ljsd.jieling.util;
import com.ljsd.jieling.config.classsStaticCfg.MapStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.MapStaticConfig;
import com.ljsd.jieling.protocols.CommonProto;
import config.SMonsterConfig;
import config.SMonsterGroup;

View File

@ -1,5 +1,5 @@
#server info
server.id = 50215
server.id = 10215
server.openTime = 20190101000101
server.num = 1
@ -7,10 +7,10 @@ server.guildFight = false
# redis config
# Redis数据库索引默认为0
spring.redis.database=13
spring.redis.database=1
#spring.redis.database=2
# Redis服务器地址
spring.redis.host=60.1.1.14
spring.redis.host=60.1.1.21
# Redis服务器连接端口
spring.redis.port=6379
# Redis服务器连接密码默认为空
@ -32,7 +32,8 @@ spring.redis.expireTime = -1
#spring.data.mongodb.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/ysj_wx_1
#spring.data.mongodb2.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/develop_ysj_wx_1
#mongodb2 develop
spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_50215
spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10215
spring.data.mongodbcore.uri = mongodb://60.1.1.14:27017/jl_core
#spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10212
mongodb.options.maxWaitTime = 120000
mongodb.options.connectTimeout = 1000

View File

@ -1,10 +1,7 @@
package config;
import manager.STableManager;
import manager.Table;
import java.util.Map;
@Table(name ="BlessingRewardPool")
public class SBlessingRewardPool implements BaseConfig {

View File

@ -1,10 +1,7 @@
package config;
import manager.STableManager;
import manager.Table;
import java.util.Map;
@Table(name ="BloodyBattleReward")
public class SBloodyBattleReward implements BaseConfig {

View File

@ -1,10 +1,7 @@
package config;
import manager.STableManager;
import manager.Table;
import java.util.Map;
@Table(name = "ChallengeStarBox")
public class SChallengeStarBox implements BaseConfig{
@Override

View File

@ -1,6 +1,5 @@
package config;
import manager.STableManager;
import manager.Table;
import java.util.Map;

View File

@ -1,10 +1,7 @@
package config;
import manager.STableManager;
import manager.Table;
import java.util.Map;
@Table(name ="EquipTalismanaRankup")
public class SEquipTalismanaRankup implements BaseConfig {

View File

@ -1,10 +1,7 @@
package config;
import manager.STableManager;
import manager.Table;
import java.util.Map;
@Table(name ="GuildScoreConfig")
public class SGuildScoreConfig implements BaseConfig {

View File

@ -28,7 +28,7 @@ public class STreasureSunlongConfig implements BaseConfig {
public static Map<Integer,STreasureSunlongConfig> levelTreasureConfigMap;
@Override
public void init() throws Exception {
treasureSunlongConfigMap=STableManager.getConfig(STreasureSunlongConfig.class);
treasureSunlongConfigMap= STableManager.getConfig(STreasureSunlongConfig.class);
levelTreasureConfigMap= new HashMap<>(treasureSunlongConfigMap.size());
for(Map.Entry<Integer,STreasureSunlongConfig> entry:treasureSunlongConfigMap.entrySet()){
STreasureSunlongConfig config = entry.getValue();

View File

@ -101,14 +101,12 @@ public class STableManager {
List<Class<?>> staticConfigsclass = new LinkedList<>();
try {
ClassLoaderHelper.findLocalClass("com.ljsd.jieling.config.classsStaticCfg", AbstractClassStaticConfig.class, STableManager.class.getClassLoader(), staticConfigsclass);
ClassLoaderHelper.findLocalClass("com.ljsd.jieling.config.clazzStaticCfg", AbstractClassStaticConfig.class,Thread.currentThread().getContextClassLoader(), staticConfigsclass);
}catch (RuntimeException e){
}
try {
ClassLoaderHelper.findClassJar("com.ljsd.jieling.config.classsStaticCfg", AbstractClassStaticConfig.class, STableManager.class.getClassLoader(), staticConfigsclass);
ClassLoaderHelper.findClassJar("com.ljsd.jieling.config.clazzStaticCfg", AbstractClassStaticConfig.class, Thread.currentThread().getContextClassLoader(), staticConfigsclass);
}catch (RuntimeException e){
}
for (Class<?> cls : staticConfigsclass) {
if (tables != null) {
@ -120,6 +118,7 @@ public class STableManager {
classStaticConfigMap.put(cls.getName(), newClassConfig);
}
} catch (InstantiationException | IllegalAccessException e2) {
LOGGER.error("e={}",e2);
}
}