diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java index 2fa84e605..cf984da91 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java @@ -81022,35 +81022,33 @@ public final class CommonProto { public interface ChampionBattlePairInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { - // optional string attackName = 1; + // optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; /** - * optional string attackName = 1; + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; */ - boolean hasAttackName(); + boolean hasAttackInfo(); /** - * optional string attackName = 1; + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; */ - java.lang.String getAttackName(); + com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getAttackInfo(); /** - * optional string attackName = 1; + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; */ - com.google.protobuf.ByteString - getAttackNameBytes(); + com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getAttackInfoOrBuilder(); - // optional string defName = 2; + // optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; /** - * optional string defName = 2; + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; */ - boolean hasDefName(); + boolean hasDefInfo(); /** - * optional string defName = 2; + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; */ - java.lang.String getDefName(); + com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getDefInfo(); /** - * optional string defName = 2; + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; */ - com.google.protobuf.ByteString - getDefNameBytes(); + com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getDefInfoOrBuilder(); // optional int32 fightResult = 3; /** @@ -81221,13 +81219,29 @@ public final class CommonProto { break; } 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; - attackName_ = input.readBytes(); break; } 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; - defName_ = input.readBytes(); break; } case 24: { @@ -81300,90 +81314,48 @@ public final class CommonProto { } private int bitField0_; - // optional string attackName = 1; - public static final int ATTACKNAME_FIELD_NUMBER = 1; - private java.lang.Object attackName_; + // optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; + public static final int ATTACKINFO_FIELD_NUMBER = 1; + private com.ljsd.jieling.protocols.CommonProto.TeamOneInfo attackInfo_; /** - * optional string attackName = 1; + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; */ - public boolean hasAttackName() { + public boolean hasAttackInfo() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional string attackName = 1; + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; */ - public java.lang.String getAttackName() { - java.lang.Object ref = attackName_; - 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; - } + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getAttackInfo() { + return attackInfo_; } /** - * optional string attackName = 1; + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; */ - public com.google.protobuf.ByteString - getAttackNameBytes() { - 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; - } + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getAttackInfoOrBuilder() { + return attackInfo_; } - // optional string defName = 2; - public static final int DEFNAME_FIELD_NUMBER = 2; - private java.lang.Object defName_; + // optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; + public static final int DEFINFO_FIELD_NUMBER = 2; + private com.ljsd.jieling.protocols.CommonProto.TeamOneInfo defInfo_; /** - * optional string defName = 2; + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; */ - public boolean hasDefName() { + public boolean hasDefInfo() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional string defName = 2; + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; */ - public java.lang.String getDefName() { - java.lang.Object ref = defName_; - 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; - } + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getDefInfo() { + return defInfo_; } /** - * optional string defName = 2; + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; */ - public com.google.protobuf.ByteString - getDefNameBytes() { - 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; - } + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getDefInfoOrBuilder() { + return defInfo_; } // optional int32 fightResult = 3; @@ -81562,8 +81534,8 @@ public final class CommonProto { } private void initFields() { - attackName_ = ""; - defName_ = ""; + attackInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance(); + defInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance(); fightResult_ = 0; id_ = ""; roundTImes_ = 0; @@ -81584,10 +81556,10 @@ public final class CommonProto { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getAttackNameBytes()); + output.writeMessage(1, attackInfo_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, getDefNameBytes()); + output.writeMessage(2, defInfo_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { output.writeInt32(3, fightResult_); @@ -81618,11 +81590,11 @@ public final class CommonProto { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getAttackNameBytes()); + .computeMessageSize(1, attackInfo_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getDefNameBytes()); + .computeMessageSize(2, defInfo_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream @@ -81756,6 +81728,8 @@ public final class CommonProto { } private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getAttackInfoFieldBuilder(); + getDefInfoFieldBuilder(); } } private static Builder create() { @@ -81764,9 +81738,17 @@ public final class CommonProto { public Builder clear() { super.clear(); - attackName_ = ""; + if (attackInfoBuilder_ == null) { + attackInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance(); + } else { + attackInfoBuilder_.clear(); + } bitField0_ = (bitField0_ & ~0x00000001); - defName_ = ""; + if (defInfoBuilder_ == null) { + defInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance(); + } else { + defInfoBuilder_.clear(); + } bitField0_ = (bitField0_ & ~0x00000002); fightResult_ = 0; bitField0_ = (bitField0_ & ~0x00000004); @@ -81811,11 +81793,19 @@ public final class CommonProto { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.attackName_ = attackName_; + if (attackInfoBuilder_ == null) { + result.attackInfo_ = attackInfo_; + } else { + result.attackInfo_ = attackInfoBuilder_.build(); + } if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.defName_ = defName_; + if (defInfoBuilder_ == null) { + result.defInfo_ = defInfo_; + } else { + result.defInfo_ = defInfoBuilder_.build(); + } if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } @@ -81856,15 +81846,11 @@ public final class CommonProto { public Builder mergeFrom(com.ljsd.jieling.protocols.CommonProto.ChampionBattlePairInfo other) { if (other == com.ljsd.jieling.protocols.CommonProto.ChampionBattlePairInfo.getDefaultInstance()) return this; - if (other.hasAttackName()) { - bitField0_ |= 0x00000001; - attackName_ = other.attackName_; - onChanged(); + if (other.hasAttackInfo()) { + mergeAttackInfo(other.getAttackInfo()); } - if (other.hasDefName()) { - bitField0_ |= 0x00000002; - defName_ = other.defName_; - onChanged(); + if (other.hasDefInfo()) { + mergeDefInfo(other.getDefInfo()); } if (other.hasFightResult()) { setFightResult(other.getFightResult()); @@ -81913,152 +81899,238 @@ public final class CommonProto { } private int bitField0_; - // optional string attackName = 1; - private java.lang.Object attackName_ = ""; + // optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; + 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_; /** - * optional string attackName = 1; + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; */ - public boolean hasAttackName() { + public boolean hasAttackInfo() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional string attackName = 1; + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; */ - public java.lang.String getAttackName() { - java.lang.Object ref = attackName_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - attackName_ = s; - return s; + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getAttackInfo() { + if (attackInfoBuilder_ == null) { + return attackInfo_; } else { - return (java.lang.String) ref; + return attackInfoBuilder_.getMessage(); } } /** - * optional string attackName = 1; + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; */ - public com.google.protobuf.ByteString - getAttackNameBytes() { - 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; + public Builder setAttackInfo(com.ljsd.jieling.protocols.CommonProto.TeamOneInfo value) { + if (attackInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + attackInfo_ = value; + onChanged(); } else { - return (com.google.protobuf.ByteString) ref; + attackInfoBuilder_.setMessage(value); } - } - /** - * optional string attackName = 1; - */ - public Builder setAttackName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - attackName_ = value; - onChanged(); + bitField0_ |= 0x00000001; return this; } /** - * optional string attackName = 1; + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; */ - 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; + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; + */ + 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; + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; + */ + public Builder clearAttackInfo() { + if (attackInfoBuilder_ == null) { + attackInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance(); + onChanged(); + } else { + attackInfoBuilder_.clear(); + } bitField0_ = (bitField0_ & ~0x00000001); - attackName_ = getDefaultInstance().getAttackName(); - onChanged(); return this; } /** - * optional string attackName = 1; + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; */ - public Builder setAttackNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - attackName_ = value; + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder getAttackInfoBuilder() { + bitField0_ |= 0x00000001; onChanged(); - return this; + return getAttackInfoFieldBuilder().getBuilder(); + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getAttackInfoOrBuilder() { + if (attackInfoBuilder_ != null) { + return attackInfoBuilder_.getMessageOrBuilder(); + } else { + return attackInfo_; + } + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo attackInfo = 1; + */ + 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; - private java.lang.Object defName_ = ""; + // optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; + 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_; /** - * optional string defName = 2; + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; */ - public boolean hasDefName() { + public boolean hasDefInfo() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional string defName = 2; + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; */ - public java.lang.String getDefName() { - java.lang.Object ref = defName_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - defName_ = s; - return s; + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo getDefInfo() { + if (defInfoBuilder_ == null) { + return defInfo_; } else { - return (java.lang.String) ref; + return defInfoBuilder_.getMessage(); } } /** - * optional string defName = 2; + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; */ - public com.google.protobuf.ByteString - getDefNameBytes() { - 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; + public Builder setDefInfo(com.ljsd.jieling.protocols.CommonProto.TeamOneInfo value) { + if (defInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + defInfo_ = value; + onChanged(); } else { - return (com.google.protobuf.ByteString) ref; + defInfoBuilder_.setMessage(value); } - } - /** - * optional string defName = 2; - */ - public Builder setDefName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - defName_ = value; - onChanged(); + bitField0_ |= 0x00000002; return this; } /** - * optional string defName = 2; + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; */ - 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; + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; + */ + 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; + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; + */ + public Builder clearDefInfo() { + if (defInfoBuilder_ == null) { + defInfo_ = com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.getDefaultInstance(); + onChanged(); + } else { + defInfoBuilder_.clear(); + } bitField0_ = (bitField0_ & ~0x00000002); - defName_ = getDefaultInstance().getDefName(); - onChanged(); return this; } /** - * optional string defName = 2; + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; */ - public Builder setDefNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - defName_ = value; + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfo.Builder getDefInfoBuilder() { + bitField0_ |= 0x00000002; onChanged(); - return this; + return getDefInfoFieldBuilder().getBuilder(); + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; + */ + public com.ljsd.jieling.protocols.CommonProto.TeamOneInfoOrBuilder getDefInfoOrBuilder() { + if (defInfoBuilder_ != null) { + return defInfoBuilder_.getMessageOrBuilder(); + } else { + return defInfo_; + } + } + /** + * optional .com.ljsd.jieling.protocols.TeamOneInfo defInfo = 2; + */ + 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; @@ -83112,11 +83184,14 @@ public final class CommonProto { "s.TeamOneInfo\022:\n\tenemyInfo\030\002 \001(\0132\'.com.l" + "jsd.jieling.protocols.TeamOneInfo\022\016\n\006res" + "ult\030\003 \001(\005\0228\n\tfightData\030\004 \001(\0132%.com.ljsd." + - "jieling.protocols.FightData\"\245\001\n\026Champion" + - "BattlePairInfo\022\022\n\nattackName\030\001 \001(\t\022\017\n\007de", - "fName\030\002 \001(\t\022\023\n\013fightResult\030\003 \001(\005\022\n\n\002id\030\004" + - " \001(\t\022\022\n\nroundTImes\030\005 \001(\005\022\016\n\006teamId\030\006 \001(\005" + - "\022\020\n\010position\030\007 \001(\005\022\017\n\007isGUess\030\010 \001(\005B\002H\001" + "jieling.protocols.FightData\"\367\001\n\026Champion" + + "BattlePairInfo\022;\n\nattackInfo\030\001 \001(\0132\'.com", + ".ljsd.jieling.protocols.TeamOneInfo\0228\n\007d" + + "efInfo\030\002 \001(\0132\'.com.ljsd.jieling.protocol" + + "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 = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -83662,7 +83737,7 @@ public final class CommonProto { internal_static_com_ljsd_jieling_protocols_ChampionBattlePairInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_ChampionBattlePairInfo_descriptor, - new java.lang.String[] { "AttackName", "DefName", "FightResult", "Id", "RoundTImes", "TeamId", "Position", "IsGUess", }); + new java.lang.String[] { "AttackInfo", "DefInfo", "FightResult", "Id", "RoundTImes", "TeamId", "Position", "IsGUess", }); return null; } }; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/VipPrivilegeType.java b/serverlogic/src/main/java/com/ljsd/jieling/core/VipPrivilegeType.java index 058e58a80..cc1040c6b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/VipPrivilegeType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/VipPrivilegeType.java @@ -25,6 +25,7 @@ public interface VipPrivilegeType { int FREE_HERO_RANDOM = 14;//免费抽取妖灵师 int FREE_SECRET_RANDOM = 15; //解锁免费抽取秘盒 int TOWER_RESRT_NUM= 17; //每日试炼重置次数 + int TIME_RANDOM_FREE = 32;//东海寻仙每日赠送招募次数 //功能项解锁 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitRandomCardActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitRandomCardActivity.java index ab57cf5fe..dd70d01a1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitRandomCardActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitRandomCardActivity.java @@ -51,7 +51,7 @@ public class LimitRandomCardActivity extends AbstractActivity { } randomRank.addRank(cardEvent.getUid(),scoreById+cardEvent.getScore()); Predicate pre = a-> (SCHero.getHeroByPieceId(a[0])!=null&&SCHero.getHeroByPieceId(a[0]).getNatural()>=13); -// + Consumer 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); update(UserManager.getUser(cardEvent.getUid()),cardEvent.getScore()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java index 0ad063dcc..7fc4c78ba 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java @@ -29,6 +29,7 @@ import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.ArenaInfoProto; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MessageTypeProto; +import com.ljsd.jieling.thread.ThreadManager; import com.ljsd.jieling.util.*; import config.*; ; @@ -87,8 +88,6 @@ public class ChampionshipLogic { for (ArenaRecord arenaRecord : arenaRecords) { int attackId = arenaRecord.getAttackId(); int defUid = arenaRecord.getDefUid(); - String attackName = getRoleNameById(attackId, config); - String defName = getRoleNameById(defUid, config); int fightResult = arenaRecord.getFightResult(); if (arenaRecord.getRoundTims() == roundTimes && progress % 10 % 4 != 3) { fightResult = -1; @@ -106,8 +105,8 @@ public class ChampionshipLogic { } builder.addChampionBattlePairInfo(CommonProto.ChampionBattlePairInfo.newBuilder() - .setAttackName(attackName) - .setDefName(defName) + .setAttackInfo(getChampionBattleInfo(attackId)) + .setDefInfo(getChampionBattleInfo(defUid)) .setFightResult(fightResult) .setRoundTImes(arenaRecord.getRoundTims()) .setTeamId(teamId) @@ -374,7 +373,10 @@ public class ChampionshipLogic { for(Integer sendId : sendIds.keySet()){ User user = UserManager.getUser(sendId); Item item = user.getItemManager().getItem(arenaItemId); - int itemNum = item.getItemNum(); + int itemNum=0; + if(item!=null){ + itemNum = item.getItemNum(); + } if(item!=null && itemNum>0){ int[][] costs = new int[1][]; costs[0] = new int[2]; @@ -385,6 +387,7 @@ public class ChampionshipLogic { itemReward.put(rewardItemId,itemNum/sChampionshipSetting.getExchangeItem()); ItemUtil.addItem(user,itemReward,null,BIReason.CHAMPIONM_EXCHANGE_REWARD); } + LOGGER.info("the uid={},send rewardnum={}",itemNum/sChampionshipSetting.getExchangeItem()); } MongoUtil.getLjsdMongoTemplate().lastUpdate(); @@ -1236,7 +1239,7 @@ public class ChampionshipLogic { int myUid = session.getUid(); CommonProto.ArenaEnemy myInfo = null; ArenaInfoProto.ChampionGetWorldRankResponse.Builder builder = ArenaInfoProto.ChampionGetWorldRankResponse.newBuilder(); - if(end> arenaRankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.CHAMPION_RANK,"", start, end); for (ZSetOperations.TypedTuple item : arenaRankInfo) { 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(); if(myRank != -1){ myInfo=getEnemyInfo(myUid, myRank,0,0); @@ -1371,14 +1374,38 @@ public class ChampionshipLogic { } if(progress%10%4==0){ - selectToBattle(); + ThreadManager.getScheduledExecutor().execute(new Runnable() { + @Override + public void run() { + selectToBattle(); + } + }); } if(progress%10%4==1){ //竞猜阶段 后台自动运行战斗 - switchBet(timeControllerOfFunction.getId()); + ThreadManager.getScheduledExecutor().execute(new Runnable() { + @Override + public void run() { + try { + switchBet(timeControllerOfFunction.getId()); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + }else if(progress%10%4==3){ //结算阶段 //等待玩家数据分数入redis - scoreToRedis(); - sendBetReward(); + ThreadManager.getScheduledExecutor().execute(new Runnable() { + @Override + public void run() { + try { + scoreToRedis(); + sendBetReward(); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); } sendAllProgressUpdate(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java index 5bb66a0b6..7c03601f0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java @@ -161,6 +161,7 @@ public class UserMissionManager extends MongoBase { break; case MISSING_ROOM_REFRESH: Map mustAppear = new HashMap<>(); + List mustMissions = new ArrayList<>(); if((int)parm[0]==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.getDoingMissionIds().clear(); + }else{ + mustMissions.add(SMazeTreasureSetting.sMazeTreasureSetting.getFirstRefresh()); } - List mustMissions = new ArrayList<>(); if(!mustAppear.isEmpty()){ for(Map.Entry entry:mustAppear.entrySet()){ List sMazeTreasures = SMazeTreasure.mazeMapByTaskType.get(entry.getKey()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index c90f61410..aa2068b50 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -223,11 +223,24 @@ public class HeroLogic{ //检验消耗 boolean allowFree = false; - if(perCount == 1 && sLotterySetting.getLotteryType() == 1){ - allowFree = user.getPlayerInfoManager().check(VipPrivilegeType.FREE_HERO_RANDOM, 1); + int privilege = 0; + 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){ - boolean enoughCost = false; for (int[] cost:sLotterySetting.getCostItem()){ int [][] costItems = new int[][]{cost}; @@ -240,7 +253,7 @@ public class HeroLogic{ throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } }else{ - user.getPlayerInfoManager().updateVipPrivilage(VipPrivilegeType.FREE_HERO_RANDOM, 1); + user.getPlayerInfoManager().updateVipPrivilage(privilege, 1); } //额外获取 int length = perCount; @@ -1882,10 +1895,10 @@ public class HeroLogic{ MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.POKEMON_ADVANCED_RESPONSE_VALUE,null,true); String message=null; 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)){ - 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){ ChatLogic.getInstance().sendSysChatMessage(message,Global.DILIGENT,sDifferDemonsConfig.getId(),0,0,0,0,0); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissingRoomMissionType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissingRoomMissionType.java index 5069f26d4..20d1d0233 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissingRoomMissionType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissingRoomMissionType.java @@ -28,11 +28,7 @@ public class MissingRoomMissionType extends AbstractMissionType{ private int refreshTotalCount; -// private int coinRefreshCount; -// -// private int higherDailyRefreshCount; -// -// private int especialDailyRefreshCount; + @Override public void openMission(User user, int missionId, List missionTypeEnumList) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index df8b3e643..846990a9a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -426,7 +426,7 @@ public class PlayerLogic { } } 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()); }else{ int theIndexByTarget = MathUtils.getTheIndexByTarget(sRechargeCommodityConfig.getPlayerLevel(), level); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index 4fabf6a48..30d8a4c48 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -109,12 +109,12 @@ public class BuyGoodsLogic { } int nowTime =(int) (TimeUtils.now()/1000); - if(type == GiftGoodsType.MONTHCARD || type == GiftGoodsType.LUXURYMONTHCARD || type == GiftGoodsType.WEEKCARD){ + if(sRechargeCommodityConfig.getContiueDays()>0){ Integer endTime = null; Map goodsDurationMap = rechargeInfo.getGoodsDurationMap(); boolean needSendMail = false; for(Map.Entry goodsDurationItem : goodsDurationMap.entrySet()){ - if(SRechargeCommodityConfig.rechargeCommodityConfigMap.get(goodsDurationItem.getKey()).getType() == type){ + if( SRechargeCommodityConfig.rechargeCommodityConfigMap.get(goodsDurationItem.getKey()).getType() == type){ endTime = goodsDurationItem.getValue(); } } @@ -123,7 +123,7 @@ public class BuyGoodsLogic { needSendMail = true; } - if(nowTime sDifferDemonsConfigMap; public static Map sDifferDemonsConfigMapByComId; @@ -56,4 +58,8 @@ public class SDifferDemonsConfig implements BaseConfig { public String getName() { return name; } + + public int getQuality() { + return quality; + } } \ No newline at end of file diff --git a/tablemanager/src/main/java/config/SMazeTreasureSetting.java b/tablemanager/src/main/java/config/SMazeTreasureSetting.java index 129ed1823..3f605a02a 100644 --- a/tablemanager/src/main/java/config/SMazeTreasureSetting.java +++ b/tablemanager/src/main/java/config/SMazeTreasureSetting.java @@ -27,6 +27,8 @@ public class SMazeTreasureSetting implements BaseConfig { private int refreshVIP; + private int firstRefresh; + public static SMazeTreasureSetting sMazeTreasureSetting; @@ -71,4 +73,8 @@ public class SMazeTreasureSetting implements BaseConfig { public int getRefreshVIP() { return refreshVIP; } + + public int getFirstRefresh() { + return firstRefresh; + } } \ No newline at end of file diff --git a/tablemanager/src/main/java/config/SSpecialConfig.java b/tablemanager/src/main/java/config/SSpecialConfig.java index af445412d..7fa6d4e42 100644 --- a/tablemanager/src/main/java/config/SSpecialConfig.java +++ b/tablemanager/src/main/java/config/SSpecialConfig.java @@ -51,7 +51,7 @@ public class SSpecialConfig implements BaseConfig { public static final String SUNLONG_REWARD = "Sunlong_Reward";//孙龙的宝藏礼包\ 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_FREEINTEGRAL = "time_limit_recruitment_FreeIntegral";//东海寻仙每获得150分赠送一次免费招募 @Override public void init() throws Exception { diff --git a/test/src/main/java/Test.java b/test/src/main/java/Test.java new file mode 100644 index 000000000..547cde6ef --- /dev/null +++ b/test/src/main/java/Test.java @@ -0,0 +1,4 @@ +package PACKAGE_NAME; + +public class Test { +}