双方信息

back_recharge
wangyuan 2019-12-24 16:36:10 +08:00
parent dbd1ce04a6
commit 3e453d600c
2 changed files with 281 additions and 206 deletions

View File

@ -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 (value == null) {
if (ref instanceof String) { throw new NullPointerException();
com.google.protobuf.ByteString b = }
com.google.protobuf.ByteString.copyFromUtf8( attackInfo_ = value;
(java.lang.String) ref); onChanged();
attackName_ = b;
return b;
} else { } else {
return (com.google.protobuf.ByteString) ref; attackInfoBuilder_.setMessage(value);
} }
} bitField0_ |= 0x00000001;
/**
* <code>optional string attackName = 1;</code>
*/
public Builder setAttackName(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000001;
attackName_ = value;
onChanged();
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) { bitField0_ |= 0x00000001;
if (value == null) {
throw new NullPointerException();
}
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 (value == null) {
if (ref instanceof String) { throw new NullPointerException();
com.google.protobuf.ByteString b = }
com.google.protobuf.ByteString.copyFromUtf8( defInfo_ = value;
(java.lang.String) ref); onChanged();
defName_ = b;
return b;
} else { } else {
return (com.google.protobuf.ByteString) ref; defInfoBuilder_.setMessage(value);
} }
} bitField0_ |= 0x00000002;
/**
* <code>optional string defName = 2;</code>
*/
public Builder setDefName(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000002;
defName_ = value;
onChanged();
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) { bitField0_ |= 0x00000002;
if (value == null) {
throw new NullPointerException();
}
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;
} }
}; };

View File

@ -106,8 +106,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)