diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/ArenaInfoProto.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/ArenaInfoProto.java
index 0126f6b27..cce009aba 100644
--- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/ArenaInfoProto.java
+++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/ArenaInfoProto.java
@@ -12945,31 +12945,41 @@ public final class ArenaInfoProto {
*/
int getBetResult();
- // optional .com.ljsd.jieling.protocols.FightData fightData = 3;
+ // optional int32 myBetCoins = 3;
/**
- * optional .com.ljsd.jieling.protocols.FightData fightData = 3;
+ * optional int32 myBetCoins = 3;
*
*
- *战斗数据 + * 我的下注 **/ - boolean hasFightData(); + boolean hasMyBetCoins(); /** - *
optional .com.ljsd.jieling.protocols.FightData fightData = 3;
+ * optional int32 myBetCoins = 3;
*
* - *战斗数据 + * 我的下注 **/ - com.ljsd.jieling.protocols.CommonProto.FightData getFightData(); + int getMyBetCoins(); + + // optional int32 myWinCoins = 4; /** - *
optional .com.ljsd.jieling.protocols.FightData fightData = 3;
+ * optional int32 myWinCoins = 4;
*
* - *战斗数据 + * 我获取 **/ - com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder getFightDataOrBuilder(); + boolean hasMyWinCoins(); + /** + *
optional int32 myWinCoins = 4;
+ *
+ * + * 我获取 + *+ */ + int getMyWinCoins(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.ChampionMyBetDetail} @@ -13040,17 +13050,14 @@ public final class ArenaInfoProto { betResult_ = input.readInt32(); break; } - case 26: { - com.ljsd.jieling.protocols.CommonProto.FightData.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = fightData_.toBuilder(); - } - fightData_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.FightData.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(fightData_); - fightData_ = subBuilder.buildPartial(); - } + case 24: { bitField0_ |= 0x00000004; + myBetCoins_ = input.readInt32(); + break; + } + case 32: { + bitField0_ |= 0x00000008; + myWinCoins_ = input.readInt32(); break; } } @@ -13151,44 +13158,59 @@ public final class ArenaInfoProto { return betResult_; } - // optional .com.ljsd.jieling.protocols.FightData fightData = 3; - public static final int FIGHTDATA_FIELD_NUMBER = 3; - private com.ljsd.jieling.protocols.CommonProto.FightData fightData_; + // optional int32 myBetCoins = 3; + public static final int MYBETCOINS_FIELD_NUMBER = 3; + private int myBetCoins_; /** - *
optional .com.ljsd.jieling.protocols.FightData fightData = 3;
+ * optional int32 myBetCoins = 3;
*
* - *战斗数据 + * 我的下注 **/ - public boolean hasFightData() { + public boolean hasMyBetCoins() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - *
optional .com.ljsd.jieling.protocols.FightData fightData = 3;
+ * optional int32 myBetCoins = 3;
*
* - *战斗数据 + * 我的下注 **/ - public com.ljsd.jieling.protocols.CommonProto.FightData getFightData() { - return fightData_; + public int getMyBetCoins() { + return myBetCoins_; + } + + // optional int32 myWinCoins = 4; + public static final int MYWINCOINS_FIELD_NUMBER = 4; + private int myWinCoins_; + /** + *
optional int32 myWinCoins = 4;
+ *
+ * + * 我获取 + *+ */ + public boolean hasMyWinCoins() { + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - *
optional .com.ljsd.jieling.protocols.FightData fightData = 3;
+ * optional int32 myWinCoins = 4;
*
* - *战斗数据 + * 我获取 **/ - public com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder getFightDataOrBuilder() { - return fightData_; + public int getMyWinCoins() { + return myWinCoins_; } private void initFields() { enemyPairInfo_ = com.ljsd.jieling.protocols.ArenaInfoProto.ChampionTwoEnemInfo.getDefaultInstance(); betResult_ = 0; - fightData_ = com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance(); + myBetCoins_ = 0; + myWinCoins_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -13209,7 +13231,10 @@ public final class ArenaInfoProto { output.writeInt32(2, betResult_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeMessage(3, fightData_); + output.writeInt32(3, myBetCoins_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeInt32(4, myWinCoins_); } getUnknownFields().writeTo(output); } @@ -13230,7 +13255,11 @@ public final class ArenaInfoProto { } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, fightData_); + .computeInt32Size(3, myBetCoins_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(4, myWinCoins_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -13341,7 +13370,6 @@ public final class ArenaInfoProto { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { getEnemyPairInfoFieldBuilder(); - getFightDataFieldBuilder(); } } private static Builder create() { @@ -13358,12 +13386,10 @@ public final class ArenaInfoProto { bitField0_ = (bitField0_ & ~0x00000001); betResult_ = 0; bitField0_ = (bitField0_ & ~0x00000002); - if (fightDataBuilder_ == null) { - fightData_ = com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance(); - } else { - fightDataBuilder_.clear(); - } + myBetCoins_ = 0; bitField0_ = (bitField0_ & ~0x00000004); + myWinCoins_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -13407,11 +13433,11 @@ public final class ArenaInfoProto { if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - if (fightDataBuilder_ == null) { - result.fightData_ = fightData_; - } else { - result.fightData_ = fightDataBuilder_.build(); + result.myBetCoins_ = myBetCoins_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; } + result.myWinCoins_ = myWinCoins_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -13434,8 +13460,11 @@ public final class ArenaInfoProto { if (other.hasBetResult()) { setBetResult(other.getBetResult()); } - if (other.hasFightData()) { - mergeFightData(other.getFightData()); + if (other.hasMyBetCoins()) { + setMyBetCoins(other.getMyBetCoins()); + } + if (other.hasMyWinCoins()) { + setMyWinCoins(other.getMyWinCoins()); } this.mergeUnknownFields(other.getUnknownFields()); return this; @@ -13666,157 +13695,102 @@ public final class ArenaInfoProto { return this; } - // optional .com.ljsd.jieling.protocols.FightData fightData = 3; - private com.ljsd.jieling.protocols.CommonProto.FightData fightData_ = com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - com.ljsd.jieling.protocols.CommonProto.FightData, com.ljsd.jieling.protocols.CommonProto.FightData.Builder, com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder> fightDataBuilder_; + // optional int32 myBetCoins = 3; + private int myBetCoins_ ; /** - *
optional .com.ljsd.jieling.protocols.FightData fightData = 3;
+ * optional int32 myBetCoins = 3;
*
* - *战斗数据 + * 我的下注 **/ - public boolean hasFightData() { + public boolean hasMyBetCoins() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - *
optional .com.ljsd.jieling.protocols.FightData fightData = 3;
+ * optional int32 myBetCoins = 3;
*
* - *战斗数据 + * 我的下注 **/ - public com.ljsd.jieling.protocols.CommonProto.FightData getFightData() { - if (fightDataBuilder_ == null) { - return fightData_; - } else { - return fightDataBuilder_.getMessage(); - } + public int getMyBetCoins() { + return myBetCoins_; } /** - *
optional .com.ljsd.jieling.protocols.FightData fightData = 3;
+ * optional int32 myBetCoins = 3;
*
* - *战斗数据 + * 我的下注 **/ - public Builder setFightData(com.ljsd.jieling.protocols.CommonProto.FightData value) { - if (fightDataBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - fightData_ = value; - onChanged(); - } else { - fightDataBuilder_.setMessage(value); - } - bitField0_ |= 0x00000004; - return this; - } - /** - *
optional .com.ljsd.jieling.protocols.FightData fightData = 3;
- *
- * - *战斗数据 - *- */ - public Builder setFightData( - com.ljsd.jieling.protocols.CommonProto.FightData.Builder builderForValue) { - if (fightDataBuilder_ == null) { - fightData_ = builderForValue.build(); - onChanged(); - } else { - fightDataBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000004; - return this; - } - /** - *
optional .com.ljsd.jieling.protocols.FightData fightData = 3;
- *
- * - *战斗数据 - *- */ - public Builder mergeFightData(com.ljsd.jieling.protocols.CommonProto.FightData value) { - if (fightDataBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004) && - fightData_ != com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance()) { - fightData_ = - com.ljsd.jieling.protocols.CommonProto.FightData.newBuilder(fightData_).mergeFrom(value).buildPartial(); - } else { - fightData_ = value; - } - onChanged(); - } else { - fightDataBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000004; - return this; - } - /** - *
optional .com.ljsd.jieling.protocols.FightData fightData = 3;
- *
- * - *战斗数据 - *- */ - public Builder clearFightData() { - if (fightDataBuilder_ == null) { - fightData_ = com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance(); - onChanged(); - } else { - fightDataBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } - /** - *
optional .com.ljsd.jieling.protocols.FightData fightData = 3;
- *
- * - *战斗数据 - *- */ - public com.ljsd.jieling.protocols.CommonProto.FightData.Builder getFightDataBuilder() { + public Builder setMyBetCoins(int value) { bitField0_ |= 0x00000004; + myBetCoins_ = value; onChanged(); - return getFightDataFieldBuilder().getBuilder(); + return this; } /** - *
optional .com.ljsd.jieling.protocols.FightData fightData = 3;
+ * optional int32 myBetCoins = 3;
*
* - *战斗数据 + * 我的下注 **/ - public com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder getFightDataOrBuilder() { - if (fightDataBuilder_ != null) { - return fightDataBuilder_.getMessageOrBuilder(); - } else { - return fightData_; - } + public Builder clearMyBetCoins() { + bitField0_ = (bitField0_ & ~0x00000004); + myBetCoins_ = 0; + onChanged(); + return this; + } + + // optional int32 myWinCoins = 4; + private int myWinCoins_ ; + /** + *
optional int32 myWinCoins = 4;
+ *
+ * + * 我获取 + *+ */ + public boolean hasMyWinCoins() { + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - *
optional .com.ljsd.jieling.protocols.FightData fightData = 3;
+ * optional int32 myWinCoins = 4;
*
* - *战斗数据 + * 我获取 **/ - private com.google.protobuf.SingleFieldBuilder< - com.ljsd.jieling.protocols.CommonProto.FightData, com.ljsd.jieling.protocols.CommonProto.FightData.Builder, com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder> - getFightDataFieldBuilder() { - if (fightDataBuilder_ == null) { - fightDataBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.ljsd.jieling.protocols.CommonProto.FightData, com.ljsd.jieling.protocols.CommonProto.FightData.Builder, com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder>( - fightData_, - getParentForChildren(), - isClean()); - fightData_ = null; - } - return fightDataBuilder_; + public int getMyWinCoins() { + return myWinCoins_; + } + /** + *
optional int32 myWinCoins = 4;
+ *
+ * + * 我获取 + *+ */ + public Builder setMyWinCoins(int value) { + bitField0_ |= 0x00000008; + myWinCoins_ = value; + onChanged(); + return this; + } + /** + *
optional int32 myWinCoins = 4;
+ *
+ * + * 我获取 + *+ */ + public Builder clearMyWinCoins() { + bitField0_ = (bitField0_ & ~0x00000008); + myWinCoins_ = 0; + onChanged(); + return this; } // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ChampionMyBetDetail) @@ -16558,21 +16532,20 @@ public final class ArenaInfoProto { "rotocols.ArenaEnemy\0229\n\tblueEnemy\030\002 \001(\0132&" + ".com.ljsd.jieling.protocols.ArenaEnemy\022\023" + "\n\013fightResult\030\003 \001(\005\022\022\n\nroundTimes\030\004 \001(\005\022" + - "\n\n\002id\030\005 \001(\t\"\252\001\n\023ChampionMyBetDetail\022F\n\re" + + "\n\n\002id\030\005 \001(\t\"\230\001\n\023ChampionMyBetDetail\022F\n\re" + "nemyPairInfo\030\001 \001(\0132/.com.ljsd.jieling.pr" + "otocols.ChampionTwoEnemInfo\022\021\n\tbetResult", - "\030\002 \001(\005\0228\n\tfightData\030\003 \001(\0132%.com.ljsd.jie" + - "ling.protocols.FightData\"o\n%ChanpionGetA" + - "llMyBattleHistoryResponse\022F\n\renemyPairIn" + - "fo\030\001 \003(\0132/.com.ljsd.jieling.protocols.Ch" + - "ampionTwoEnemInfo\"p\n\037ChampionGetAllMyBet" + - "InfoResponse\022M\n\024championMyBetDetails\030\001 \003" + - "(\0132/.com.ljsd.jieling.protocols.Champion" + - "MyBetDetail\"(\n\030ChampionViewFinalRequest\022" + - "\014\n\004type\030\001 \001(\005\"o\n\031ChampionViewFinalRespon" + - "se\022R\n\026championBattlePairInfo\030\001 \003(\01322.com", - ".ljsd.jieling.protocols.ChampionBattlePa" + - "irInfoB\002H\001" + "\030\002 \001(\005\022\022\n\nmyBetCoins\030\003 \001(\005\022\022\n\nmyWinCoins" + + "\030\004 \001(\005\"o\n%ChanpionGetAllMyBattleHistoryR" + + "esponse\022F\n\renemyPairInfo\030\001 \003(\0132/.com.ljs" + + "d.jieling.protocols.ChampionTwoEnemInfo\"" + + "p\n\037ChampionGetAllMyBetInfoResponse\022M\n\024ch" + + "ampionMyBetDetails\030\001 \003(\0132/.com.ljsd.jiel" + + "ing.protocols.ChampionMyBetDetail\"(\n\030Cha" + + "mpionViewFinalRequest\022\014\n\004type\030\001 \001(\005\"o\n\031C" + + "hampionViewFinalResponse\022R\n\026championBatt" + + "lePairInfo\030\001 \003(\01322.com.ljsd.jieling.prot", + "ocols.ChampionBattlePairInfoB\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -16686,7 +16659,7 @@ public final class ArenaInfoProto { internal_static_com_ljsd_jieling_protocols_ChampionMyBetDetail_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_ChampionMyBetDetail_descriptor, - new java.lang.String[] { "EnemyPairInfo", "BetResult", "FightData", }); + new java.lang.String[] { "EnemyPairInfo", "BetResult", "MyBetCoins", "MyWinCoins", }); internal_static_com_ljsd_jieling_protocols_ChanpionGetAllMyBattleHistoryResponse_descriptor = getDescriptor().getMessageTypes().get(18); internal_static_com_ljsd_jieling_protocols_ChanpionGetAllMyBattleHistoryResponse_fieldAccessorTable = new 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 9a32e2377..66042de3e 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java @@ -81019,6 +81019,24 @@ public final class CommonProto { * */ int getTeamId(); + + // optional int32 position = 7; + /** + *
optional int32 position = 7;
+ *
+ * + *位置 1 2 3 4 一次从左到右 + *+ */ + boolean hasPosition(); + /** + *
optional int32 position = 7;
+ *
+ * + *位置 1 2 3 4 一次从左到右 + *+ */ + int getPosition(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.ChampionBattlePairInfo} @@ -81101,6 +81119,11 @@ public final class CommonProto { teamId_ = input.readInt32(); break; } + case 56: { + bitField0_ |= 0x00000040; + position_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -81354,6 +81377,30 @@ public final class CommonProto { return teamId_; } + // optional int32 position = 7; + public static final int POSITION_FIELD_NUMBER = 7; + private int position_; + /** + *
optional int32 position = 7;
+ *
+ * + *位置 1 2 3 4 一次从左到右 + *+ */ + public boolean hasPosition() { + return ((bitField0_ & 0x00000040) == 0x00000040); + } + /** + *
optional int32 position = 7;
+ *
+ * + *位置 1 2 3 4 一次从左到右 + *+ */ + public int getPosition() { + return position_; + } + private void initFields() { attackName_ = ""; defName_ = ""; @@ -81361,6 +81408,7 @@ public final class CommonProto { id_ = ""; roundTImes_ = 0; teamId_ = 0; + position_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -81392,6 +81440,9 @@ public final class CommonProto { if (((bitField0_ & 0x00000020) == 0x00000020)) { output.writeInt32(6, teamId_); } + if (((bitField0_ & 0x00000040) == 0x00000040)) { + output.writeInt32(7, position_); + } getUnknownFields().writeTo(output); } @@ -81425,6 +81476,10 @@ public final class CommonProto { size += com.google.protobuf.CodedOutputStream .computeInt32Size(6, teamId_); } + if (((bitField0_ & 0x00000040) == 0x00000040)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(7, position_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -81553,6 +81608,8 @@ public final class CommonProto { bitField0_ = (bitField0_ & ~0x00000010); teamId_ = 0; bitField0_ = (bitField0_ & ~0x00000020); + position_ = 0; + bitField0_ = (bitField0_ & ~0x00000040); return this; } @@ -81605,6 +81662,10 @@ public final class CommonProto { to_bitField0_ |= 0x00000020; } result.teamId_ = teamId_; + if (((from_bitField0_ & 0x00000040) == 0x00000040)) { + to_bitField0_ |= 0x00000040; + } + result.position_ = position_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -81645,6 +81706,9 @@ public final class CommonProto { if (other.hasTeamId()) { setTeamId(other.getTeamId()); } + if (other.hasPosition()) { + setPosition(other.getPosition()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -82065,6 +82129,55 @@ public final class CommonProto { return this; } + // optional int32 position = 7; + private int position_ ; + /** + *
optional int32 position = 7;
+ *
+ * + *位置 1 2 3 4 一次从左到右 + *+ */ + public boolean hasPosition() { + return ((bitField0_ & 0x00000040) == 0x00000040); + } + /** + *
optional int32 position = 7;
+ *
+ * + *位置 1 2 3 4 一次从左到右 + *+ */ + public int getPosition() { + return position_; + } + /** + *
optional int32 position = 7;
+ *
+ * + *位置 1 2 3 4 一次从左到右 + *+ */ + public Builder setPosition(int value) { + bitField0_ |= 0x00000040; + position_ = value; + onChanged(); + return this; + } + /** + *
optional int32 position = 7;
+ *
+ * + *位置 1 2 3 4 一次从左到右 + *+ */ + public Builder clearPosition() { + bitField0_ = (bitField0_ & ~0x00000040); + position_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ChampionBattlePairInfo) } @@ -82773,10 +82886,11 @@ public final class CommonProto { "\022:\n\tenemyInfo\030\002 \001(\0132\'.com.ljsd.jieling.p" + "rotocols.TeamOneInfo\022\016\n\006result\030\003 \001(\005\0228\n\t" + "fightData\030\004 \001(\0132%.com.ljsd.jieling.proto" + - "cols.FightData\"\202\001\n\026ChampionBattlePairInf" + + "cols.FightData\"\224\001\n\026ChampionBattlePairInf" + "o\022\022\n\nattackName\030\001 \001(\t\022\017\n\007defName\030\002 \001(\t\022\023", "\n\013fightResult\030\003 \001(\005\022\n\n\002id\030\004 \001(\t\022\022\n\nround" + - "TImes\030\005 \001(\005\022\016\n\006teamId\030\006 \001(\005B\002H\001" + "TImes\030\005 \001(\005\022\016\n\006teamId\030\006 \001(\005\022\020\n\010position\030" + + "\007 \001(\005B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -83322,7 +83436,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", }); + new java.lang.String[] { "AttackName", "DefName", "FightResult", "Id", "RoundTImes", "TeamId", "Position", }); return null; } }; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java index 51ce9f406..17ad0d8b0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java @@ -287,12 +287,7 @@ public class ArenaLogic { .build(); builder.setFightData(build); //数据互换 - byte[] snapRecord = CommonProto.FightData.newBuilder() - .setFightMaxTime(SArenaSetting.getSArenaSetting().getMostTime()) - .setFightSeed(seed) - .setHeroFightInfos(deffightTeamInfo) - .addMonsterList(fightTeamInfo) - .build().toByteArray(); + byte[] snapRecord = build.toByteArray(); arenaRecord.setFightData(snapRecord); return fightResult.getCheckResult()[0]; } 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 e2cab97b7..558d114f2 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 @@ -2,10 +2,12 @@ package com.ljsd.jieling.logic.championship; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.googlecode.protobuf.format.JsonFormat; import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig; import com.ljsd.jieling.core.FunctionIdEnum; import com.ljsd.jieling.core.GlobalsDef; import com.ljsd.jieling.core.HandlerLogicThread; +import com.ljsd.jieling.db.mongo.MongoUtil; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.exception.ErrorCode; @@ -80,6 +82,7 @@ public class ChampionshipLogic { }else{ arenaRecodeds = RedisUtil.getInstence().lGet(RedisKey.CHAMPION_FINAL4_JOIN_IDS, "", 0, -1); } + SChampionshipSetting sChampionshipSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getsChampionshipSetting(); List