Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
069da0c108
|
@ -81022,35 +81022,33 @@ public final class CommonProto {
|
||||||
public interface ChampionBattlePairInfoOrBuilder
|
public interface ChampionBattlePairInfoOrBuilder
|
||||||
extends com.google.protobuf.MessageOrBuilder {
|
extends com.google.protobuf.MessageOrBuilder {
|
||||||
|
|
||||||
// optional string attackName = 1;
|
// optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;
|
||||||
/**
|
/**
|
||||||
* <code>optional string attackName = 1;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
*/
|
*/
|
||||||
boolean hasAttackName();
|
boolean hasAttackInfo();
|
||||||
/**
|
/**
|
||||||
* <code>optional string attackName = 1;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
*/
|
*/
|
||||||
java.lang.String getAttackName();
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getAttackInfo();
|
||||||
/**
|
/**
|
||||||
* <code>optional string attackName = 1;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
*/
|
*/
|
||||||
com.google.protobuf.ByteString
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getAttackInfoOrBuilder();
|
||||||
getAttackNameBytes();
|
|
||||||
|
|
||||||
// optional string defName = 2;
|
// optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;
|
||||||
/**
|
/**
|
||||||
* <code>optional string defName = 2;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
*/
|
*/
|
||||||
boolean hasDefName();
|
boolean hasDefInfo();
|
||||||
/**
|
/**
|
||||||
* <code>optional string defName = 2;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
*/
|
*/
|
||||||
java.lang.String getDefName();
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getDefInfo();
|
||||||
/**
|
/**
|
||||||
* <code>optional string defName = 2;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
*/
|
*/
|
||||||
com.google.protobuf.ByteString
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getDefInfoOrBuilder();
|
||||||
getDefNameBytes();
|
|
||||||
|
|
||||||
// optional int32 fightResult = 3;
|
// optional int32 fightResult = 3;
|
||||||
/**
|
/**
|
||||||
|
@ -81221,13 +81219,29 @@ public final class CommonProto {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 10: {
|
case 10: {
|
||||||
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder subBuilder = null;
|
||||||
|
if (((bitField0_ & 0x00000001) == 0x00000001)) {
|
||||||
|
subBuilder = attackInfo_.toBuilder();
|
||||||
|
}
|
||||||
|
attackInfo_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.PARSER, extensionRegistry);
|
||||||
|
if (subBuilder != null) {
|
||||||
|
subBuilder.mergeFrom(attackInfo_);
|
||||||
|
attackInfo_ = subBuilder.buildPartial();
|
||||||
|
}
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
attackName_ = input.readBytes();
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 18: {
|
case 18: {
|
||||||
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder subBuilder = null;
|
||||||
|
if (((bitField0_ & 0x00000002) == 0x00000002)) {
|
||||||
|
subBuilder = defInfo_.toBuilder();
|
||||||
|
}
|
||||||
|
defInfo_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.PARSER, extensionRegistry);
|
||||||
|
if (subBuilder != null) {
|
||||||
|
subBuilder.mergeFrom(defInfo_);
|
||||||
|
defInfo_ = subBuilder.buildPartial();
|
||||||
|
}
|
||||||
bitField0_ |= 0x00000002;
|
bitField0_ |= 0x00000002;
|
||||||
defName_ = input.readBytes();
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 24: {
|
case 24: {
|
||||||
|
@ -81300,90 +81314,48 @@ public final class CommonProto {
|
||||||
}
|
}
|
||||||
|
|
||||||
private int bitField0_;
|
private int bitField0_;
|
||||||
// optional string attackName = 1;
|
// optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;
|
||||||
public static final int ATTACKNAME_FIELD_NUMBER = 1;
|
public static final int ATTACKINFO_FIELD_NUMBER = 1;
|
||||||
private java.lang.Object attackName_;
|
private com.ljsd.jieling.protocols.CommonProto.TeamOneInfo attackInfo_;
|
||||||
/**
|
/**
|
||||||
* <code>optional string attackName = 1;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
*/
|
*/
|
||||||
public boolean hasAttackName() {
|
public boolean hasAttackInfo() {
|
||||||
return ((bitField0_ & 0x00000001) == 0x00000001);
|
return ((bitField0_ & 0x00000001) == 0x00000001);
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* <code>optional string attackName = 1;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
*/
|
*/
|
||||||
public java.lang.String getAttackName() {
|
public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getAttackInfo() {
|
||||||
java.lang.Object ref = attackName_;
|
return attackInfo_;
|
||||||
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()) {
|
|
||||||
attackName_ = s;
|
|
||||||
}
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* <code>optional string attackName = 1;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
*/
|
*/
|
||||||
public com.google.protobuf.ByteString
|
public com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getAttackInfoOrBuilder() {
|
||||||
getAttackNameBytes() {
|
return attackInfo_;
|
||||||
java.lang.Object ref = attackName_;
|
|
||||||
if (ref instanceof java.lang.String) {
|
|
||||||
com.google.protobuf.ByteString b =
|
|
||||||
com.google.protobuf.ByteString.copyFromUtf8(
|
|
||||||
(java.lang.String) ref);
|
|
||||||
attackName_ = b;
|
|
||||||
return b;
|
|
||||||
} else {
|
|
||||||
return (com.google.protobuf.ByteString) ref;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// optional string defName = 2;
|
// optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;
|
||||||
public static final int DEFNAME_FIELD_NUMBER = 2;
|
public static final int DEFINFO_FIELD_NUMBER = 2;
|
||||||
private java.lang.Object defName_;
|
private com.ljsd.jieling.protocols.CommonProto.TeamOneInfo defInfo_;
|
||||||
/**
|
/**
|
||||||
* <code>optional string defName = 2;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
*/
|
*/
|
||||||
public boolean hasDefName() {
|
public boolean hasDefInfo() {
|
||||||
return ((bitField0_ & 0x00000002) == 0x00000002);
|
return ((bitField0_ & 0x00000002) == 0x00000002);
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* <code>optional string defName = 2;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
*/
|
*/
|
||||||
public java.lang.String getDefName() {
|
public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getDefInfo() {
|
||||||
java.lang.Object ref = defName_;
|
return defInfo_;
|
||||||
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()) {
|
|
||||||
defName_ = s;
|
|
||||||
}
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* <code>optional string defName = 2;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
*/
|
*/
|
||||||
public com.google.protobuf.ByteString
|
public com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getDefInfoOrBuilder() {
|
||||||
getDefNameBytes() {
|
return defInfo_;
|
||||||
java.lang.Object ref = defName_;
|
|
||||||
if (ref instanceof java.lang.String) {
|
|
||||||
com.google.protobuf.ByteString b =
|
|
||||||
com.google.protobuf.ByteString.copyFromUtf8(
|
|
||||||
(java.lang.String) ref);
|
|
||||||
defName_ = b;
|
|
||||||
return b;
|
|
||||||
} else {
|
|
||||||
return (com.google.protobuf.ByteString) ref;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// optional int32 fightResult = 3;
|
// optional int32 fightResult = 3;
|
||||||
|
@ -81562,8 +81534,8 @@ public final class CommonProto {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void initFields() {
|
private void initFields() {
|
||||||
attackName_ = "";
|
attackInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance();
|
||||||
defName_ = "";
|
defInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance();
|
||||||
fightResult_ = 0;
|
fightResult_ = 0;
|
||||||
id_ = "";
|
id_ = "";
|
||||||
roundTImes_ = 0;
|
roundTImes_ = 0;
|
||||||
|
@ -81584,10 +81556,10 @@ public final class CommonProto {
|
||||||
throws java.io.IOException {
|
throws java.io.IOException {
|
||||||
getSerializedSize();
|
getSerializedSize();
|
||||||
if (((bitField0_ & 0x00000001) == 0x00000001)) {
|
if (((bitField0_ & 0x00000001) == 0x00000001)) {
|
||||||
output.writeBytes(1, getAttackNameBytes());
|
output.writeMessage(1, attackInfo_);
|
||||||
}
|
}
|
||||||
if (((bitField0_ & 0x00000002) == 0x00000002)) {
|
if (((bitField0_ & 0x00000002) == 0x00000002)) {
|
||||||
output.writeBytes(2, getDefNameBytes());
|
output.writeMessage(2, defInfo_);
|
||||||
}
|
}
|
||||||
if (((bitField0_ & 0x00000004) == 0x00000004)) {
|
if (((bitField0_ & 0x00000004) == 0x00000004)) {
|
||||||
output.writeInt32(3, fightResult_);
|
output.writeInt32(3, fightResult_);
|
||||||
|
@ -81618,11 +81590,11 @@ public final class CommonProto {
|
||||||
size = 0;
|
size = 0;
|
||||||
if (((bitField0_ & 0x00000001) == 0x00000001)) {
|
if (((bitField0_ & 0x00000001) == 0x00000001)) {
|
||||||
size += com.google.protobuf.CodedOutputStream
|
size += com.google.protobuf.CodedOutputStream
|
||||||
.computeBytesSize(1, getAttackNameBytes());
|
.computeMessageSize(1, attackInfo_);
|
||||||
}
|
}
|
||||||
if (((bitField0_ & 0x00000002) == 0x00000002)) {
|
if (((bitField0_ & 0x00000002) == 0x00000002)) {
|
||||||
size += com.google.protobuf.CodedOutputStream
|
size += com.google.protobuf.CodedOutputStream
|
||||||
.computeBytesSize(2, getDefNameBytes());
|
.computeMessageSize(2, defInfo_);
|
||||||
}
|
}
|
||||||
if (((bitField0_ & 0x00000004) == 0x00000004)) {
|
if (((bitField0_ & 0x00000004) == 0x00000004)) {
|
||||||
size += com.google.protobuf.CodedOutputStream
|
size += com.google.protobuf.CodedOutputStream
|
||||||
|
@ -81756,6 +81728,8 @@ public final class CommonProto {
|
||||||
}
|
}
|
||||||
private void maybeForceBuilderInitialization() {
|
private void maybeForceBuilderInitialization() {
|
||||||
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
|
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
|
||||||
|
getAttackInfoFieldBuilder();
|
||||||
|
getDefInfoFieldBuilder();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private static Builder create() {
|
private static Builder create() {
|
||||||
|
@ -81764,9 +81738,17 @@ public final class CommonProto {
|
||||||
|
|
||||||
public Builder clear() {
|
public Builder clear() {
|
||||||
super.clear();
|
super.clear();
|
||||||
attackName_ = "";
|
if (attackInfoBuilder_ == null) {
|
||||||
|
attackInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance();
|
||||||
|
} else {
|
||||||
|
attackInfoBuilder_.clear();
|
||||||
|
}
|
||||||
bitField0_ = (bitField0_ & ~0x00000001);
|
bitField0_ = (bitField0_ & ~0x00000001);
|
||||||
defName_ = "";
|
if (defInfoBuilder_ == null) {
|
||||||
|
defInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance();
|
||||||
|
} else {
|
||||||
|
defInfoBuilder_.clear();
|
||||||
|
}
|
||||||
bitField0_ = (bitField0_ & ~0x00000002);
|
bitField0_ = (bitField0_ & ~0x00000002);
|
||||||
fightResult_ = 0;
|
fightResult_ = 0;
|
||||||
bitField0_ = (bitField0_ & ~0x00000004);
|
bitField0_ = (bitField0_ & ~0x00000004);
|
||||||
|
@ -81811,11 +81793,19 @@ public final class CommonProto {
|
||||||
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
|
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
|
||||||
to_bitField0_ |= 0x00000001;
|
to_bitField0_ |= 0x00000001;
|
||||||
}
|
}
|
||||||
result.attackName_ = attackName_;
|
if (attackInfoBuilder_ == null) {
|
||||||
|
result.attackInfo_ = attackInfo_;
|
||||||
|
} else {
|
||||||
|
result.attackInfo_ = attackInfoBuilder_.build();
|
||||||
|
}
|
||||||
if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
|
if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
|
||||||
to_bitField0_ |= 0x00000002;
|
to_bitField0_ |= 0x00000002;
|
||||||
}
|
}
|
||||||
result.defName_ = defName_;
|
if (defInfoBuilder_ == null) {
|
||||||
|
result.defInfo_ = defInfo_;
|
||||||
|
} else {
|
||||||
|
result.defInfo_ = defInfoBuilder_.build();
|
||||||
|
}
|
||||||
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
|
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
|
||||||
to_bitField0_ |= 0x00000004;
|
to_bitField0_ |= 0x00000004;
|
||||||
}
|
}
|
||||||
|
@ -81856,15 +81846,11 @@ public final class CommonProto {
|
||||||
|
|
||||||
public Builder mergeFrom(com.ljsd.jieling.protocols.CommonProto.ChampionBattlePairInfo other) {
|
public Builder mergeFrom(com.ljsd.jieling.protocols.CommonProto.ChampionBattlePairInfo other) {
|
||||||
if (other == com.ljsd.jieling.protocols.CommonProto.ChampionBattlePairInfo.getDefaultInstance()) return this;
|
if (other == com.ljsd.jieling.protocols.CommonProto.ChampionBattlePairInfo.getDefaultInstance()) return this;
|
||||||
if (other.hasAttackName()) {
|
if (other.hasAttackInfo()) {
|
||||||
bitField0_ |= 0x00000001;
|
mergeAttackInfo(other.getAttackInfo());
|
||||||
attackName_ = other.attackName_;
|
|
||||||
onChanged();
|
|
||||||
}
|
}
|
||||||
if (other.hasDefName()) {
|
if (other.hasDefInfo()) {
|
||||||
bitField0_ |= 0x00000002;
|
mergeDefInfo(other.getDefInfo());
|
||||||
defName_ = other.defName_;
|
|
||||||
onChanged();
|
|
||||||
}
|
}
|
||||||
if (other.hasFightResult()) {
|
if (other.hasFightResult()) {
|
||||||
setFightResult(other.getFightResult());
|
setFightResult(other.getFightResult());
|
||||||
|
@ -81913,152 +81899,238 @@ public final class CommonProto {
|
||||||
}
|
}
|
||||||
private int bitField0_;
|
private int bitField0_;
|
||||||
|
|
||||||
// optional string attackName = 1;
|
// optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;
|
||||||
private java.lang.Object attackName_ = "";
|
private com.ljsd.jieling.protocols.CommonProto.TeamOneInfo attackInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance();
|
||||||
|
private com.google.protobuf.SingleFieldBuilder<
|
||||||
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfo, com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder, com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder> attackInfoBuilder_;
|
||||||
/**
|
/**
|
||||||
* <code>optional string attackName = 1;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
*/
|
*/
|
||||||
public boolean hasAttackName() {
|
public boolean hasAttackInfo() {
|
||||||
return ((bitField0_ & 0x00000001) == 0x00000001);
|
return ((bitField0_ & 0x00000001) == 0x00000001);
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* <code>optional string attackName = 1;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
*/
|
*/
|
||||||
public java.lang.String getAttackName() {
|
public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getAttackInfo() {
|
||||||
java.lang.Object ref = attackName_;
|
if (attackInfoBuilder_ == null) {
|
||||||
if (!(ref instanceof java.lang.String)) {
|
return attackInfo_;
|
||||||
java.lang.String s = ((com.google.protobuf.ByteString) ref)
|
|
||||||
.toStringUtf8();
|
|
||||||
attackName_ = s;
|
|
||||||
return s;
|
|
||||||
} else {
|
} else {
|
||||||
return (java.lang.String) ref;
|
return attackInfoBuilder_.getMessage();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* <code>optional string attackName = 1;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
*/
|
*/
|
||||||
public com.google.protobuf.ByteString
|
public Builder setAttackInfo(com.ljsd.jieling.protocols.CommonProto.TeamOneInfo value) {
|
||||||
getAttackNameBytes() {
|
if (attackInfoBuilder_ == null) {
|
||||||
java.lang.Object ref = attackName_;
|
|
||||||
if (ref instanceof String) {
|
|
||||||
com.google.protobuf.ByteString b =
|
|
||||||
com.google.protobuf.ByteString.copyFromUtf8(
|
|
||||||
(java.lang.String) ref);
|
|
||||||
attackName_ = b;
|
|
||||||
return b;
|
|
||||||
} else {
|
|
||||||
return (com.google.protobuf.ByteString) ref;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* <code>optional string attackName = 1;</code>
|
|
||||||
*/
|
|
||||||
public Builder setAttackName(
|
|
||||||
java.lang.String value) {
|
|
||||||
if (value == null) {
|
if (value == null) {
|
||||||
throw new NullPointerException();
|
throw new NullPointerException();
|
||||||
}
|
}
|
||||||
bitField0_ |= 0x00000001;
|
attackInfo_ = value;
|
||||||
attackName_ = value;
|
|
||||||
onChanged();
|
onChanged();
|
||||||
|
} else {
|
||||||
|
attackInfoBuilder_.setMessage(value);
|
||||||
|
}
|
||||||
|
bitField0_ |= 0x00000001;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* <code>optional string attackName = 1;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
*/
|
*/
|
||||||
public Builder clearAttackName() {
|
public Builder setAttackInfo(
|
||||||
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder builderForValue) {
|
||||||
|
if (attackInfoBuilder_ == null) {
|
||||||
|
attackInfo_ = builderForValue.build();
|
||||||
|
onChanged();
|
||||||
|
} else {
|
||||||
|
attackInfoBuilder_.setMessage(builderForValue.build());
|
||||||
|
}
|
||||||
|
bitField0_ |= 0x00000001;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
|
*/
|
||||||
|
public Builder mergeAttackInfo(com.ljsd.jieling.protocols.CommonProto.TeamOneInfo value) {
|
||||||
|
if (attackInfoBuilder_ == null) {
|
||||||
|
if (((bitField0_ & 0x00000001) == 0x00000001) &&
|
||||||
|
attackInfo_ != com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance()) {
|
||||||
|
attackInfo_ =
|
||||||
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.newBuilder(attackInfo_).mergeFrom(value).buildPartial();
|
||||||
|
} else {
|
||||||
|
attackInfo_ = value;
|
||||||
|
}
|
||||||
|
onChanged();
|
||||||
|
} else {
|
||||||
|
attackInfoBuilder_.mergeFrom(value);
|
||||||
|
}
|
||||||
|
bitField0_ |= 0x00000001;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
|
*/
|
||||||
|
public Builder clearAttackInfo() {
|
||||||
|
if (attackInfoBuilder_ == null) {
|
||||||
|
attackInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance();
|
||||||
|
onChanged();
|
||||||
|
} else {
|
||||||
|
attackInfoBuilder_.clear();
|
||||||
|
}
|
||||||
bitField0_ = (bitField0_ & ~0x00000001);
|
bitField0_ = (bitField0_ & ~0x00000001);
|
||||||
attackName_ = getDefaultInstance().getAttackName();
|
|
||||||
onChanged();
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* <code>optional string attackName = 1;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
*/
|
*/
|
||||||
public Builder setAttackNameBytes(
|
public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder getAttackInfoBuilder() {
|
||||||
com.google.protobuf.ByteString value) {
|
|
||||||
if (value == null) {
|
|
||||||
throw new NullPointerException();
|
|
||||||
}
|
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
attackName_ = value;
|
|
||||||
onChanged();
|
onChanged();
|
||||||
return this;
|
return getAttackInfoFieldBuilder().getBuilder();
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
|
*/
|
||||||
|
public com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getAttackInfoOrBuilder() {
|
||||||
|
if (attackInfoBuilder_ != null) {
|
||||||
|
return attackInfoBuilder_.getMessageOrBuilder();
|
||||||
|
} else {
|
||||||
|
return attackInfo_;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1;</code>
|
||||||
|
*/
|
||||||
|
private com.google.protobuf.SingleFieldBuilder<
|
||||||
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfo, com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder, com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder>
|
||||||
|
getAttackInfoFieldBuilder() {
|
||||||
|
if (attackInfoBuilder_ == null) {
|
||||||
|
attackInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
|
||||||
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfo, com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder, com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder>(
|
||||||
|
attackInfo_,
|
||||||
|
getParentForChildren(),
|
||||||
|
isClean());
|
||||||
|
attackInfo_ = null;
|
||||||
|
}
|
||||||
|
return attackInfoBuilder_;
|
||||||
}
|
}
|
||||||
|
|
||||||
// optional string defName = 2;
|
// optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;
|
||||||
private java.lang.Object defName_ = "";
|
private com.ljsd.jieling.protocols.CommonProto.TeamOneInfo defInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance();
|
||||||
|
private com.google.protobuf.SingleFieldBuilder<
|
||||||
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfo, com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder, com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder> defInfoBuilder_;
|
||||||
/**
|
/**
|
||||||
* <code>optional string defName = 2;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
*/
|
*/
|
||||||
public boolean hasDefName() {
|
public boolean hasDefInfo() {
|
||||||
return ((bitField0_ & 0x00000002) == 0x00000002);
|
return ((bitField0_ & 0x00000002) == 0x00000002);
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* <code>optional string defName = 2;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
*/
|
*/
|
||||||
public java.lang.String getDefName() {
|
public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getDefInfo() {
|
||||||
java.lang.Object ref = defName_;
|
if (defInfoBuilder_ == null) {
|
||||||
if (!(ref instanceof java.lang.String)) {
|
return defInfo_;
|
||||||
java.lang.String s = ((com.google.protobuf.ByteString) ref)
|
|
||||||
.toStringUtf8();
|
|
||||||
defName_ = s;
|
|
||||||
return s;
|
|
||||||
} else {
|
} else {
|
||||||
return (java.lang.String) ref;
|
return defInfoBuilder_.getMessage();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* <code>optional string defName = 2;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
*/
|
*/
|
||||||
public com.google.protobuf.ByteString
|
public Builder setDefInfo(com.ljsd.jieling.protocols.CommonProto.TeamOneInfo value) {
|
||||||
getDefNameBytes() {
|
if (defInfoBuilder_ == null) {
|
||||||
java.lang.Object ref = defName_;
|
|
||||||
if (ref instanceof String) {
|
|
||||||
com.google.protobuf.ByteString b =
|
|
||||||
com.google.protobuf.ByteString.copyFromUtf8(
|
|
||||||
(java.lang.String) ref);
|
|
||||||
defName_ = b;
|
|
||||||
return b;
|
|
||||||
} else {
|
|
||||||
return (com.google.protobuf.ByteString) ref;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* <code>optional string defName = 2;</code>
|
|
||||||
*/
|
|
||||||
public Builder setDefName(
|
|
||||||
java.lang.String value) {
|
|
||||||
if (value == null) {
|
if (value == null) {
|
||||||
throw new NullPointerException();
|
throw new NullPointerException();
|
||||||
}
|
}
|
||||||
bitField0_ |= 0x00000002;
|
defInfo_ = value;
|
||||||
defName_ = value;
|
|
||||||
onChanged();
|
onChanged();
|
||||||
|
} else {
|
||||||
|
defInfoBuilder_.setMessage(value);
|
||||||
|
}
|
||||||
|
bitField0_ |= 0x00000002;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* <code>optional string defName = 2;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
*/
|
*/
|
||||||
public Builder clearDefName() {
|
public Builder setDefInfo(
|
||||||
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder builderForValue) {
|
||||||
|
if (defInfoBuilder_ == null) {
|
||||||
|
defInfo_ = builderForValue.build();
|
||||||
|
onChanged();
|
||||||
|
} else {
|
||||||
|
defInfoBuilder_.setMessage(builderForValue.build());
|
||||||
|
}
|
||||||
|
bitField0_ |= 0x00000002;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
|
*/
|
||||||
|
public Builder mergeDefInfo(com.ljsd.jieling.protocols.CommonProto.TeamOneInfo value) {
|
||||||
|
if (defInfoBuilder_ == null) {
|
||||||
|
if (((bitField0_ & 0x00000002) == 0x00000002) &&
|
||||||
|
defInfo_ != com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance()) {
|
||||||
|
defInfo_ =
|
||||||
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.newBuilder(defInfo_).mergeFrom(value).buildPartial();
|
||||||
|
} else {
|
||||||
|
defInfo_ = value;
|
||||||
|
}
|
||||||
|
onChanged();
|
||||||
|
} else {
|
||||||
|
defInfoBuilder_.mergeFrom(value);
|
||||||
|
}
|
||||||
|
bitField0_ |= 0x00000002;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
|
*/
|
||||||
|
public Builder clearDefInfo() {
|
||||||
|
if (defInfoBuilder_ == null) {
|
||||||
|
defInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance();
|
||||||
|
onChanged();
|
||||||
|
} else {
|
||||||
|
defInfoBuilder_.clear();
|
||||||
|
}
|
||||||
bitField0_ = (bitField0_ & ~0x00000002);
|
bitField0_ = (bitField0_ & ~0x00000002);
|
||||||
defName_ = getDefaultInstance().getDefName();
|
|
||||||
onChanged();
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* <code>optional string defName = 2;</code>
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
*/
|
*/
|
||||||
public Builder setDefNameBytes(
|
public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder getDefInfoBuilder() {
|
||||||
com.google.protobuf.ByteString value) {
|
|
||||||
if (value == null) {
|
|
||||||
throw new NullPointerException();
|
|
||||||
}
|
|
||||||
bitField0_ |= 0x00000002;
|
bitField0_ |= 0x00000002;
|
||||||
defName_ = value;
|
|
||||||
onChanged();
|
onChanged();
|
||||||
return this;
|
return getDefInfoFieldBuilder().getBuilder();
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
|
*/
|
||||||
|
public com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getDefInfoOrBuilder() {
|
||||||
|
if (defInfoBuilder_ != null) {
|
||||||
|
return defInfoBuilder_.getMessageOrBuilder();
|
||||||
|
} else {
|
||||||
|
return defInfo_;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* <code>optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2;</code>
|
||||||
|
*/
|
||||||
|
private com.google.protobuf.SingleFieldBuilder<
|
||||||
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfo, com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder, com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder>
|
||||||
|
getDefInfoFieldBuilder() {
|
||||||
|
if (defInfoBuilder_ == null) {
|
||||||
|
defInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
|
||||||
|
com.ljsd.jieling.protocols.CommonProto.TeamOneInfo, com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder, com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder>(
|
||||||
|
defInfo_,
|
||||||
|
getParentForChildren(),
|
||||||
|
isClean());
|
||||||
|
defInfo_ = null;
|
||||||
|
}
|
||||||
|
return defInfoBuilder_;
|
||||||
}
|
}
|
||||||
|
|
||||||
// optional int32 fightResult = 3;
|
// optional int32 fightResult = 3;
|
||||||
|
@ -83112,11 +83184,14 @@ public final class CommonProto {
|
||||||
"s.TeamOneInfo\022:\n\tenemyInfo\030\002 \001(\0132\'.com.l" +
|
"s.TeamOneInfo\022:\n\tenemyInfo\030\002 \001(\0132\'.com.l" +
|
||||||
"jsd.jieling.protocols.TeamOneInfo\022\016\n\006res" +
|
"jsd.jieling.protocols.TeamOneInfo\022\016\n\006res" +
|
||||||
"ult\030\003 \001(\005\0228\n\tfightData\030\004 \001(\0132%.com.ljsd." +
|
"ult\030\003 \001(\005\0228\n\tfightData\030\004 \001(\0132%.com.ljsd." +
|
||||||
"jieling.protocols.FightData\"\245\001\n\026Champion" +
|
"jieling.protocols.FightData\"\367\001\n\026Champion" +
|
||||||
"BattlePairInfo\022\022\n\nattackName\030\001 \001(\t\022\017\n\007de",
|
"BattlePairInfo\022;\n\nattackInfo\030\001 \001(\0132\'.com",
|
||||||
"fName\030\002 \001(\t\022\023\n\013fightResult\030\003 \001(\005\022\n\n\002id\030\004" +
|
".ljsd.jieling.protocols.TeamOneInfo\0228\n\007d" +
|
||||||
" \001(\t\022\022\n\nroundTImes\030\005 \001(\005\022\016\n\006teamId\030\006 \001(\005" +
|
"efInfo\030\002 \001(\0132\'.com.ljsd.jieling.protocol" +
|
||||||
"\022\020\n\010position\030\007 \001(\005\022\017\n\007isGUess\030\010 \001(\005B\002H\001"
|
"s.TeamOneInfo\022\023\n\013fightResult\030\003 \001(\005\022\n\n\002id" +
|
||||||
|
"\030\004 \001(\t\022\022\n\nroundTImes\030\005 \001(\005\022\016\n\006teamId\030\006 \001" +
|
||||||
|
"(\005\022\020\n\010position\030\007 \001(\005\022\017\n\007isGUess\030\010 \001(\005B\002H" +
|
||||||
|
"\001"
|
||||||
};
|
};
|
||||||
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
|
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
|
||||||
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
|
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
|
||||||
|
@ -83662,7 +83737,7 @@ public final class CommonProto {
|
||||||
internal_static_com_ljsd_jieling_protocols_ChampionBattlePairInfo_fieldAccessorTable = new
|
internal_static_com_ljsd_jieling_protocols_ChampionBattlePairInfo_fieldAccessorTable = new
|
||||||
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
|
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
|
||||||
internal_static_com_ljsd_jieling_protocols_ChampionBattlePairInfo_descriptor,
|
internal_static_com_ljsd_jieling_protocols_ChampionBattlePairInfo_descriptor,
|
||||||
new java.lang.String[] { "AttackName", "DefName", "FightResult", "Id", "RoundTImes", "TeamId", "Position", "IsGUess", });
|
new java.lang.String[] { "AttackInfo", "DefInfo", "FightResult", "Id", "RoundTImes", "TeamId", "Position", "IsGUess", });
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -25,6 +25,7 @@ public interface VipPrivilegeType {
|
||||||
int FREE_HERO_RANDOM = 14;//免费抽取妖灵师
|
int FREE_HERO_RANDOM = 14;//免费抽取妖灵师
|
||||||
int FREE_SECRET_RANDOM = 15; //解锁免费抽取秘盒
|
int FREE_SECRET_RANDOM = 15; //解锁免费抽取秘盒
|
||||||
int TOWER_RESRT_NUM= 17; //每日试炼重置次数
|
int TOWER_RESRT_NUM= 17; //每日试炼重置次数
|
||||||
|
int TIME_RANDOM_FREE = 32;//东海寻仙每日赠送招募次数
|
||||||
|
|
||||||
|
|
||||||
//功能项解锁
|
//功能项解锁
|
||||||
|
|
|
@ -51,7 +51,7 @@ public class LimitRandomCardActivity extends AbstractActivity {
|
||||||
}
|
}
|
||||||
randomRank.addRank(cardEvent.getUid(),scoreById+cardEvent.getScore());
|
randomRank.addRank(cardEvent.getUid(),scoreById+cardEvent.getScore());
|
||||||
Predicate<int[]> pre = a-> (SCHero.getHeroByPieceId(a[0])!=null&&SCHero.getHeroByPieceId(a[0]).getNatural()>=13);
|
Predicate<int[]> pre = a-> (SCHero.getHeroByPieceId(a[0])!=null&&SCHero.getHeroByPieceId(a[0]).getNatural()>=13);
|
||||||
//
|
|
||||||
Consumer<int[]> consumer = a->RankContext.getRankEnum(RankEnum.RANDOM_CARD_PERFECT_RANK.getType()).addRank(cardEvent.getUid(), TimeUtils.now()/1000,a[0]);
|
Consumer<int[]> consumer = a->RankContext.getRankEnum(RankEnum.RANDOM_CARD_PERFECT_RANK.getType()).addRank(cardEvent.getUid(), TimeUtils.now()/1000,a[0]);
|
||||||
Stream.of(cardEvent.getHeros()).filter(pre).forEach(consumer);
|
Stream.of(cardEvent.getHeros()).filter(pre).forEach(consumer);
|
||||||
update(UserManager.getUser(cardEvent.getUid()),cardEvent.getScore());
|
update(UserManager.getUser(cardEvent.getUid()),cardEvent.getScore());
|
||||||
|
|
|
@ -29,6 +29,7 @@ import com.ljsd.jieling.network.session.ISession;
|
||||||
import com.ljsd.jieling.protocols.ArenaInfoProto;
|
import com.ljsd.jieling.protocols.ArenaInfoProto;
|
||||||
import com.ljsd.jieling.protocols.CommonProto;
|
import com.ljsd.jieling.protocols.CommonProto;
|
||||||
import com.ljsd.jieling.protocols.MessageTypeProto;
|
import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||||
|
import com.ljsd.jieling.thread.ThreadManager;
|
||||||
import com.ljsd.jieling.util.*;
|
import com.ljsd.jieling.util.*;
|
||||||
import config.*;
|
import config.*;
|
||||||
;
|
;
|
||||||
|
@ -87,8 +88,6 @@ public class ChampionshipLogic {
|
||||||
for (ArenaRecord arenaRecord : arenaRecords) {
|
for (ArenaRecord arenaRecord : arenaRecords) {
|
||||||
int attackId = arenaRecord.getAttackId();
|
int attackId = arenaRecord.getAttackId();
|
||||||
int defUid = arenaRecord.getDefUid();
|
int defUid = arenaRecord.getDefUid();
|
||||||
String attackName = getRoleNameById(attackId, config);
|
|
||||||
String defName = getRoleNameById(defUid, config);
|
|
||||||
int fightResult = arenaRecord.getFightResult();
|
int fightResult = arenaRecord.getFightResult();
|
||||||
if (arenaRecord.getRoundTims() == roundTimes && progress % 10 % 4 != 3) {
|
if (arenaRecord.getRoundTims() == roundTimes && progress % 10 % 4 != 3) {
|
||||||
fightResult = -1;
|
fightResult = -1;
|
||||||
|
@ -106,8 +105,8 @@ public class ChampionshipLogic {
|
||||||
}
|
}
|
||||||
|
|
||||||
builder.addChampionBattlePairInfo(CommonProto.ChampionBattlePairInfo.newBuilder()
|
builder.addChampionBattlePairInfo(CommonProto.ChampionBattlePairInfo.newBuilder()
|
||||||
.setAttackName(attackName)
|
.setAttackInfo(getChampionBattleInfo(attackId))
|
||||||
.setDefName(defName)
|
.setDefInfo(getChampionBattleInfo(defUid))
|
||||||
.setFightResult(fightResult)
|
.setFightResult(fightResult)
|
||||||
.setRoundTImes(arenaRecord.getRoundTims())
|
.setRoundTImes(arenaRecord.getRoundTims())
|
||||||
.setTeamId(teamId)
|
.setTeamId(teamId)
|
||||||
|
@ -374,7 +373,10 @@ public class ChampionshipLogic {
|
||||||
for(Integer sendId : sendIds.keySet()){
|
for(Integer sendId : sendIds.keySet()){
|
||||||
User user = UserManager.getUser(sendId);
|
User user = UserManager.getUser(sendId);
|
||||||
Item item = user.getItemManager().getItem(arenaItemId);
|
Item item = user.getItemManager().getItem(arenaItemId);
|
||||||
int itemNum = item.getItemNum();
|
int itemNum=0;
|
||||||
|
if(item!=null){
|
||||||
|
itemNum = item.getItemNum();
|
||||||
|
}
|
||||||
if(item!=null && itemNum>0){
|
if(item!=null && itemNum>0){
|
||||||
int[][] costs = new int[1][];
|
int[][] costs = new int[1][];
|
||||||
costs[0] = new int[2];
|
costs[0] = new int[2];
|
||||||
|
@ -385,6 +387,7 @@ public class ChampionshipLogic {
|
||||||
itemReward.put(rewardItemId,itemNum/sChampionshipSetting.getExchangeItem());
|
itemReward.put(rewardItemId,itemNum/sChampionshipSetting.getExchangeItem());
|
||||||
ItemUtil.addItem(user,itemReward,null,BIReason.CHAMPIONM_EXCHANGE_REWARD);
|
ItemUtil.addItem(user,itemReward,null,BIReason.CHAMPIONM_EXCHANGE_REWARD);
|
||||||
}
|
}
|
||||||
|
LOGGER.info("the uid={},send rewardnum={}",itemNum/sChampionshipSetting.getExchangeItem());
|
||||||
|
|
||||||
}
|
}
|
||||||
MongoUtil.getLjsdMongoTemplate().lastUpdate();
|
MongoUtil.getLjsdMongoTemplate().lastUpdate();
|
||||||
|
@ -1236,7 +1239,7 @@ public class ChampionshipLogic {
|
||||||
int myUid = session.getUid();
|
int myUid = session.getUid();
|
||||||
CommonProto.ArenaEnemy myInfo = null;
|
CommonProto.ArenaEnemy myInfo = null;
|
||||||
ArenaInfoProto.ChampionGetWorldRankResponse.Builder builder = ArenaInfoProto.ChampionGetWorldRankResponse.newBuilder();
|
ArenaInfoProto.ChampionGetWorldRankResponse.Builder builder = ArenaInfoProto.ChampionGetWorldRankResponse.newBuilder();
|
||||||
if(end<rankEndLine) {
|
if(start<=rankEndLine) {
|
||||||
Set<ZSetOperations.TypedTuple<String>> arenaRankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.CHAMPION_RANK,"", start, end);
|
Set<ZSetOperations.TypedTuple<String>> arenaRankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.CHAMPION_RANK,"", start, end);
|
||||||
for (ZSetOperations.TypedTuple<String> item : arenaRankInfo) {
|
for (ZSetOperations.TypedTuple<String> item : arenaRankInfo) {
|
||||||
String value = item.getValue();
|
String value = item.getValue();
|
||||||
|
@ -1253,7 +1256,7 @@ public class ChampionshipLogic {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(myInfo==null && end>=rankEndLine){
|
if(myInfo==null && start<=rankEndLine){
|
||||||
int myRank= RedisUtil.getInstence().getZSetreverseRank(RedisKey.CHAMPION_RANK,"",Integer.toString(myUid)).intValue();
|
int myRank= RedisUtil.getInstence().getZSetreverseRank(RedisKey.CHAMPION_RANK,"",Integer.toString(myUid)).intValue();
|
||||||
if(myRank != -1){
|
if(myRank != -1){
|
||||||
myInfo=getEnemyInfo(myUid, myRank,0,0);
|
myInfo=getEnemyInfo(myUid, myRank,0,0);
|
||||||
|
@ -1371,14 +1374,38 @@ public class ChampionshipLogic {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(progress%10%4==0){
|
if(progress%10%4==0){
|
||||||
|
ThreadManager.getScheduledExecutor().execute(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
selectToBattle();
|
selectToBattle();
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
if(progress%10%4==1){ //竞猜阶段 后台自动运行战斗
|
if(progress%10%4==1){ //竞猜阶段 后台自动运行战斗
|
||||||
|
ThreadManager.getScheduledExecutor().execute(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
try {
|
||||||
switchBet(timeControllerOfFunction.getId());
|
switchBet(timeControllerOfFunction.getId());
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
}else if(progress%10%4==3){ //结算阶段
|
}else if(progress%10%4==3){ //结算阶段
|
||||||
//等待玩家数据分数入redis
|
//等待玩家数据分数入redis
|
||||||
|
ThreadManager.getScheduledExecutor().execute(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
try {
|
||||||
scoreToRedis();
|
scoreToRedis();
|
||||||
sendBetReward();
|
sendBetReward();
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
sendAllProgressUpdate();
|
sendAllProgressUpdate();
|
||||||
}
|
}
|
||||||
|
|
|
@ -161,6 +161,7 @@ public class UserMissionManager extends MongoBase {
|
||||||
break;
|
break;
|
||||||
case MISSING_ROOM_REFRESH:
|
case MISSING_ROOM_REFRESH:
|
||||||
Map<Integer,Integer> mustAppear = new HashMap<>();
|
Map<Integer,Integer> mustAppear = new HashMap<>();
|
||||||
|
List<Integer> mustMissions = new ArrayList<>();
|
||||||
if((int)parm[0]==1){
|
if((int)parm[0]==1){
|
||||||
//删除已经领取奖励的
|
//删除已经领取奖励的
|
||||||
missingRoomMissionType.getFinishMissionIds().removeIf(value->missingRoomMissionType.getAllMissingTime().get(value)==-1);
|
missingRoomMissionType.getFinishMissionIds().removeIf(value->missingRoomMissionType.getAllMissingTime().get(value)==-1);
|
||||||
|
@ -195,8 +196,9 @@ public class UserMissionManager extends MongoBase {
|
||||||
missingRoomMissionType.setRefreshTotalCount(missingRoomMissionType.getRefreshTotalCount()+1);
|
missingRoomMissionType.setRefreshTotalCount(missingRoomMissionType.getRefreshTotalCount()+1);
|
||||||
}
|
}
|
||||||
missingRoomMissionType.getDoingMissionIds().clear();
|
missingRoomMissionType.getDoingMissionIds().clear();
|
||||||
|
}else{
|
||||||
|
mustMissions.add(SMazeTreasureSetting.sMazeTreasureSetting.getFirstRefresh());
|
||||||
}
|
}
|
||||||
List<Integer> mustMissions = new ArrayList<>();
|
|
||||||
if(!mustAppear.isEmpty()){
|
if(!mustAppear.isEmpty()){
|
||||||
for(Map.Entry<Integer,Integer> entry:mustAppear.entrySet()){
|
for(Map.Entry<Integer,Integer> entry:mustAppear.entrySet()){
|
||||||
List<SMazeTreasure> sMazeTreasures = SMazeTreasure.mazeMapByTaskType.get(entry.getKey());
|
List<SMazeTreasure> sMazeTreasures = SMazeTreasure.mazeMapByTaskType.get(entry.getKey());
|
||||||
|
|
|
@ -223,11 +223,24 @@ public class HeroLogic{
|
||||||
|
|
||||||
//检验消耗
|
//检验消耗
|
||||||
boolean allowFree = false;
|
boolean allowFree = false;
|
||||||
if(perCount == 1 && sLotterySetting.getLotteryType() == 1){
|
int privilege = 0;
|
||||||
allowFree = user.getPlayerInfoManager().check(VipPrivilegeType.FREE_HERO_RANDOM, 1);
|
if(perCount == 1){
|
||||||
|
switch (sLotterySetting.getLotteryType()){
|
||||||
|
case 1:
|
||||||
|
privilege = VipPrivilegeType.FREE_HERO_RANDOM;
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
privilege = VipPrivilegeType.TIME_RANDOM_FREE;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if(privilege!=0){
|
||||||
|
allowFree = user.getPlayerInfoManager().check(privilege, 1);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
if(!allowFree){
|
if(!allowFree){
|
||||||
|
|
||||||
boolean enoughCost = false;
|
boolean enoughCost = false;
|
||||||
for (int[] cost:sLotterySetting.getCostItem()){
|
for (int[] cost:sLotterySetting.getCostItem()){
|
||||||
int [][] costItems = new int[][]{cost};
|
int [][] costItems = new int[][]{cost};
|
||||||
|
@ -240,7 +253,7 @@ public class HeroLogic{
|
||||||
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
|
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
user.getPlayerInfoManager().updateVipPrivilage(VipPrivilegeType.FREE_HERO_RANDOM, 1);
|
user.getPlayerInfoManager().updateVipPrivilage(privilege, 1);
|
||||||
}
|
}
|
||||||
//额外获取
|
//额外获取
|
||||||
int length = perCount;
|
int length = perCount;
|
||||||
|
@ -1882,10 +1895,10 @@ public class HeroLogic{
|
||||||
MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.POKEMON_ADVANCED_RESPONSE_VALUE,null,true);
|
MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.POKEMON_ADVANCED_RESPONSE_VALUE,null,true);
|
||||||
String message=null;
|
String message=null;
|
||||||
if(pokemon.getAllStage()==1){
|
if(pokemon.getAllStage()==1){
|
||||||
message = SErrorCodeEerverConfig.getI18NMessage("lamp_activate_differ_content", new Object[]{user.getPlayerInfoManager().getNickName(),sDifferDemonsConfig.getName() });
|
message = SErrorCodeEerverConfig.getI18NMessage("lamp_activate_differ_content_"+sDifferDemonsConfig.getQuality(), new Object[]{user.getPlayerInfoManager().getNickName(),sDifferDemonsConfig.getName() });
|
||||||
|
|
||||||
}else if(pokemon.getAllStage()>=SSpecialConfig.getIntegerValue(SSpecialConfig.lamp_rankup_differ_content_parm)){
|
}else if(pokemon.getAllStage()>=SSpecialConfig.getIntegerValue(SSpecialConfig.lamp_rankup_differ_content_parm)){
|
||||||
message = SErrorCodeEerverConfig.getI18NMessage("lamp_rankup_differ_content", new Object[]{user.getPlayerInfoManager().getNickName(), sDifferDemonsConfig.getName(),pokemon.getAllStage()});
|
message = SErrorCodeEerverConfig.getI18NMessage("lamp_rankup_differ_content_"+sDifferDemonsConfig.getQuality(), new Object[]{user.getPlayerInfoManager().getNickName(), sDifferDemonsConfig.getName(),pokemon.getAllStage()});
|
||||||
}
|
}
|
||||||
if(message!=null){
|
if(message!=null){
|
||||||
ChatLogic.getInstance().sendSysChatMessage(message,Global.DILIGENT,sDifferDemonsConfig.getId(),0,0,0,0,0);
|
ChatLogic.getInstance().sendSysChatMessage(message,Global.DILIGENT,sDifferDemonsConfig.getId(),0,0,0,0,0);
|
||||||
|
|
|
@ -28,11 +28,7 @@ public class MissingRoomMissionType extends AbstractMissionType{
|
||||||
|
|
||||||
private int refreshTotalCount;
|
private int refreshTotalCount;
|
||||||
|
|
||||||
// private int coinRefreshCount;
|
|
||||||
//
|
|
||||||
// private int higherDailyRefreshCount;
|
|
||||||
//
|
|
||||||
// private int especialDailyRefreshCount;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void openMission(User user, int missionId, List<MissionStateChangeInfo> missionTypeEnumList) {
|
public void openMission(User user, int missionId, List<MissionStateChangeInfo> missionTypeEnumList) {
|
||||||
|
|
|
@ -426,7 +426,7 @@ public class PlayerLogic {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mailReward = ItemUtil.getMailReward(rewards);
|
mailReward = ItemUtil.getMailReward(rewards);
|
||||||
}else if( type == GiftGoodsType.FOUND){
|
}else if( type == GiftGoodsType.FOUND_ONE || type == GiftGoodsType.FOUND_TWO){
|
||||||
mailReward = ItemUtil.getMailReward(SLuxuryFund.getByFoundIdAndDay(goodsInfo.getKey(),days).getreward());
|
mailReward = ItemUtil.getMailReward(SLuxuryFund.getByFoundIdAndDay(goodsInfo.getKey(),days).getreward());
|
||||||
}else{
|
}else{
|
||||||
int theIndexByTarget = MathUtils.getTheIndexByTarget(sRechargeCommodityConfig.getPlayerLevel(), level);
|
int theIndexByTarget = MathUtils.getTheIndexByTarget(sRechargeCommodityConfig.getPlayerLevel(), level);
|
||||||
|
|
|
@ -109,7 +109,7 @@ public class BuyGoodsLogic {
|
||||||
}
|
}
|
||||||
|
|
||||||
int nowTime =(int) (TimeUtils.now()/1000);
|
int nowTime =(int) (TimeUtils.now()/1000);
|
||||||
if(type == GiftGoodsType.MONTHCARD || type == GiftGoodsType.LUXURYMONTHCARD || type == GiftGoodsType.WEEKCARD){
|
if(sRechargeCommodityConfig.getContiueDays()>0){
|
||||||
Integer endTime = null;
|
Integer endTime = null;
|
||||||
Map<Integer, Integer> goodsDurationMap = rechargeInfo.getGoodsDurationMap();
|
Map<Integer, Integer> goodsDurationMap = rechargeInfo.getGoodsDurationMap();
|
||||||
boolean needSendMail = false;
|
boolean needSendMail = false;
|
||||||
|
@ -123,7 +123,7 @@ public class BuyGoodsLogic {
|
||||||
needSendMail = true;
|
needSendMail = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(nowTime<endTime-STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getNextAvailableTime()*3600){
|
if( (type == GiftGoodsType.MONTHCARD || type == GiftGoodsType.LUXURYMONTHCARD ) && nowTime<endTime-STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getNextAvailableTime()*3600){
|
||||||
resultRes.setResultCode(0);
|
resultRes.setResultCode(0);
|
||||||
resultRes.setResultMsg("不可以过早购买");
|
resultRes.setResultMsg("不可以过早购买");
|
||||||
return resultRes;
|
return resultRes;
|
||||||
|
@ -341,7 +341,7 @@ public class BuyGoodsLogic {
|
||||||
if(needClear){
|
if(needClear){
|
||||||
rechargeInfo.clearCacheSendId();
|
rechargeInfo.clearCacheSendId();
|
||||||
}
|
}
|
||||||
boolean ishadbouthtLuxuryMonthCard = isHadBought(buyGoodsTimes,GiftGoodsType.LUXURYMONTHCARD);
|
|
||||||
for(SRechargeCommodityConfig sRechargeCommodityConfig :SRechargeCommodityConfig.rechargeCommodityConfigMap.values()){
|
for(SRechargeCommodityConfig sRechargeCommodityConfig :SRechargeCommodityConfig.rechargeCommodityConfigMap.values()){
|
||||||
int limit = sRechargeCommodityConfig.getLimit();
|
int limit = sRechargeCommodityConfig.getLimit();
|
||||||
int goodsId = sRechargeCommodityConfig.getId();
|
int goodsId = sRechargeCommodityConfig.getId();
|
||||||
|
@ -362,9 +362,7 @@ public class BuyGoodsLogic {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(sRechargeCommodityConfig.getType() == GiftGoodsType.FOUND && !ishadbouthtLuxuryMonthCard){
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
int[] discountType = sRechargeCommodityConfig.getDiscountType();
|
int[] discountType = sRechargeCommodityConfig.getDiscountType();
|
||||||
int time = sRechargeCommodityConfig.getTime();
|
int time = sRechargeCommodityConfig.getTime();
|
||||||
|
|
|
@ -8,5 +8,6 @@ public interface GiftGoodsType {
|
||||||
int DIRECTBAG=5; //5直购礼包
|
int DIRECTBAG=5; //5直购礼包
|
||||||
int LUXURYMONTHCARD =6;//6豪华月卡
|
int LUXURYMONTHCARD =6;//6豪华月卡
|
||||||
int WEEKCARD = 7; //周卡
|
int WEEKCARD = 7; //周卡
|
||||||
int FOUND = 8; //豪华基金
|
int FOUND_ONE = 8; //豪华基金
|
||||||
|
int FOUND_TWO = 9; //豪华基金
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,7 @@ public class MinuteTask extends Thread {
|
||||||
ActivityLogic.getInstance().checkSecretBoxSeason();
|
ActivityLogic.getInstance().checkSecretBoxSeason();
|
||||||
StoreLogic.checkGlobalStore(false);
|
StoreLogic.checkGlobalStore(false);
|
||||||
MapLogic.getInstance().minuteCheckAndRemoveMapRank();
|
MapLogic.getInstance().minuteCheckAndRemoveMapRank();
|
||||||
GlobalDataManaager.getInstance().checkSystemFunctioIsOpen();
|
|
||||||
everyZeroTask();
|
everyZeroTask();
|
||||||
everyFiveTask();
|
everyFiveTask();
|
||||||
everyMondyFiveClockTask();
|
everyMondyFiveClockTask();
|
||||||
|
@ -69,7 +69,7 @@ public class MinuteTask extends Thread {
|
||||||
CoreLogic.getInstance().checkCoreCdk();
|
CoreLogic.getInstance().checkCoreCdk();
|
||||||
BuyGoodsLogic.minuteCheckReharge();
|
BuyGoodsLogic.minuteCheckReharge();
|
||||||
RedisUtil.getInstence().set(RedisKey.ONLINE_NUM+RedisKey.Delimiter_colon+GameApplication.serverId, String.valueOf(OnlineUserManager.sessionMap.entrySet().size()));
|
RedisUtil.getInstence().set(RedisKey.ONLINE_NUM+RedisKey.Delimiter_colon+GameApplication.serverId, String.valueOf(OnlineUserManager.sessionMap.entrySet().size()));
|
||||||
ChampionshipLogic.minuteCheck(false);
|
|
||||||
LOGGER.info("MinuteTask end...");
|
LOGGER.info("MinuteTask end...");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.error("e",e);
|
LOGGER.error("e",e);
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package com.ljsd.jieling.thread.task;
|
package com.ljsd.jieling.thread.task;
|
||||||
|
|
||||||
|
import com.ljsd.jieling.logic.GlobalDataManaager;
|
||||||
|
import com.ljsd.jieling.logic.championship.ChampionshipLogic;
|
||||||
import com.ljsd.jieling.logic.dao.GuilidManager;
|
import com.ljsd.jieling.logic.dao.GuilidManager;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
@ -14,9 +16,9 @@ public class SecondsTask extends Thread {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
GuilidManager.checkNeedReleaseGuild();
|
GuilidManager.checkNeedReleaseGuild();
|
||||||
|
GlobalDataManaager.getInstance().checkSystemFunctioIsOpen();
|
||||||
|
ChampionshipLogic.minuteCheck(false);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.error("e",e);
|
LOGGER.error("e",e);
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,8 @@ public class SDifferDemonsConfig implements BaseConfig {
|
||||||
|
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
|
private int quality;
|
||||||
|
|
||||||
public static Map<Integer,SDifferDemonsConfig> sDifferDemonsConfigMap;
|
public static Map<Integer,SDifferDemonsConfig> sDifferDemonsConfigMap;
|
||||||
|
|
||||||
public static Map<Integer,SDifferDemonsConfig> sDifferDemonsConfigMapByComId;
|
public static Map<Integer,SDifferDemonsConfig> sDifferDemonsConfigMapByComId;
|
||||||
|
@ -56,4 +58,8 @@ public class SDifferDemonsConfig implements BaseConfig {
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getQuality() {
|
||||||
|
return quality;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -27,6 +27,8 @@ public class SMazeTreasureSetting implements BaseConfig {
|
||||||
|
|
||||||
private int refreshVIP;
|
private int refreshVIP;
|
||||||
|
|
||||||
|
private int firstRefresh;
|
||||||
|
|
||||||
public static SMazeTreasureSetting sMazeTreasureSetting;
|
public static SMazeTreasureSetting sMazeTreasureSetting;
|
||||||
|
|
||||||
|
|
||||||
|
@ -71,4 +73,8 @@ public class SMazeTreasureSetting implements BaseConfig {
|
||||||
public int getRefreshVIP() {
|
public int getRefreshVIP() {
|
||||||
return refreshVIP;
|
return refreshVIP;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getFirstRefresh() {
|
||||||
|
return firstRefresh;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -51,7 +51,7 @@ public class SSpecialConfig implements BaseConfig {
|
||||||
public static final String SUNLONG_REWARD = "Sunlong_Reward";//孙龙的宝藏礼包\
|
public static final String SUNLONG_REWARD = "Sunlong_Reward";//孙龙的宝藏礼包\
|
||||||
public static final String LAMP_TEXT_SPEED = "lamp_text_speed";//跑马灯速度
|
public static final String LAMP_TEXT_SPEED = "lamp_text_speed";//跑马灯速度
|
||||||
public static final String TIME_LIMIT_RECRUITMENT_INTEGRAL = "time_limit_recruitment_integral";//限时抽卡一次积分
|
public static final String TIME_LIMIT_RECRUITMENT_INTEGRAL = "time_limit_recruitment_integral";//限时抽卡一次积分
|
||||||
|
public static final String TIME_LIMIT_RECRUITMENT_FREEINTEGRAL = "time_limit_recruitment_FreeIntegral";//东海寻仙每获得150分赠送一次免费招募
|
||||||
@Override
|
@Override
|
||||||
public void init() throws Exception {
|
public void init() throws Exception {
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
package PACKAGE_NAME;
|
||||||
|
|
||||||
|
public class Test {
|
||||||
|
}
|
Loading…
Reference in New Issue