From 3b6008fb4a182a93cf03a4c48542bfc2b8c6a04d Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 1 May 2020 15:06:57 +0800 Subject: [PATCH] hero position --- .../ljsd/jieling/protocols/CommonProto.java | 220 ++++++++++++------ .../jieling/logic/family/GuildFightLogic.java | 2 +- .../jieling/logic/player/PlayerLogic.java | 5 +- .../com/ljsd/jieling/util/CBean2Proto.java | 4 +- 4 files changed, 157 insertions(+), 74 deletions(-) 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 491b89c7c..5e97f2697 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java @@ -67864,6 +67864,16 @@ public final class CommonProto { * optional int32 level = 4; */ int getLevel(); + + // optional int32 position = 5; + /** + * optional int32 position = 5; + */ + boolean hasPosition(); + /** + * optional int32 position = 5; + */ + int getPosition(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.TeamSimpleInfo} @@ -67936,6 +67946,11 @@ public final class CommonProto { level_ = input.readInt32(); break; } + case 40: { + bitField0_ |= 0x00000010; + position_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -68067,11 +68082,28 @@ public final class CommonProto { return level_; } + // optional int32 position = 5; + public static final int POSITION_FIELD_NUMBER = 5; + private int position_; + /** + * optional int32 position = 5; + */ + public boolean hasPosition() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional int32 position = 5; + */ + public int getPosition() { + return position_; + } + private void initFields() { heroid_ = ""; heroTid_ = 0; star_ = 0; level_ = 0; + position_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -68097,6 +68129,9 @@ public final class CommonProto { if (((bitField0_ & 0x00000008) == 0x00000008)) { output.writeInt32(4, level_); } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + output.writeInt32(5, position_); + } getUnknownFields().writeTo(output); } @@ -68122,6 +68157,10 @@ public final class CommonProto { size += com.google.protobuf.CodedOutputStream .computeInt32Size(4, level_); } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(5, position_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -68246,6 +68285,8 @@ public final class CommonProto { bitField0_ = (bitField0_ & ~0x00000004); level_ = 0; bitField0_ = (bitField0_ & ~0x00000008); + position_ = 0; + bitField0_ = (bitField0_ & ~0x00000010); return this; } @@ -68290,6 +68331,10 @@ public final class CommonProto { to_bitField0_ |= 0x00000008; } result.level_ = level_; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { + to_bitField0_ |= 0x00000010; + } + result.position_ = position_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -68320,6 +68365,9 @@ public final class CommonProto { if (other.hasLevel()) { setLevel(other.getLevel()); } + if (other.hasPosition()) { + setPosition(other.getPosition()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -68520,6 +68568,39 @@ public final class CommonProto { return this; } + // optional int32 position = 5; + private int position_ ; + /** + * optional int32 position = 5; + */ + public boolean hasPosition() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional int32 position = 5; + */ + public int getPosition() { + return position_; + } + /** + * optional int32 position = 5; + */ + public Builder setPosition(int value) { + bitField0_ |= 0x00000010; + position_ = value; + onChanged(); + return this; + } + /** + * optional int32 position = 5; + */ + public Builder clearPosition() { + bitField0_ = (bitField0_ & ~0x00000010); + position_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.TeamSimpleInfo) } @@ -90113,75 +90194,76 @@ public final class CommonProto { "\t\022\r\n\005score\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\022\r\n\005level\030" + "\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\")" + "\n\nSignInInfo\022\014\n\004days\030\001 \001(\005\022\r\n\005state\030\002 \001(" + - "\005\"N\n\016TeamSimpleInfo\022\016\n\006heroid\030\001 \001(\t\022\017\n\007h", + "\005\"`\n\016TeamSimpleInfo\022\016\n\006heroid\030\001 \001(\t\022\017\n\007h", "eroTid\030\002 \001(\005\022\014\n\004star\030\003 \001(\005\022\r\n\005level\030\004 \001(" + - "\005\"\207\001\n\017TeamOneTeamInfo\0228\n\004team\030\001 \003(\0132*.co" + - "m.ljsd.jieling.protocols.TeamSimpleInfo\022" + - "\024\n\014PokemonInfos\030\002 \003(\005\022\022\n\ntotalForce\030\003 \001(" + - "\005\022\020\n\010remainHp\030\004 \003(\005\"\271\001\n\013TeamOneInfo\022\013\n\003u" + - "id\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\022\014\n\004name\030\003 \001(\t\022\014\n" + - "\004head\030\004 \001(\005\022\021\n\theadFrame\030\005 \001(\005\022\021\n\tguildN" + - "ame\030\007 \001(\t\0229\n\004team\030\006 \001(\0132+.com.ljsd.jieli" + - "ng.protocols.TeamOneTeamInfo\022\021\n\tisApplye" + - "d\030\010 \001(\005\"y\n\017MonsterRankInfo\022\014\n\004name\030\001 \001(\t", - "\022\r\n\005score\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\022\r\n\005level\030\004" + - " \001(\005\022\014\n\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\022\013\n" + - "\003uid\030\007 \001(\005\"2\n\rHeroBloodInfo\022\016\n\006heroId\030\001 " + - "\001(\t\022\021\n\tlostBlood\030\002 \001(\005\"D\n\013EndlessInfo\022\r\n" + - "\005mapId\030\001 \001(\005\022\022\n\nworldLevel\030\002 \001(\005\022\022\n\nbloo" + - "dScore\030\003 \001(\005\"2\n\017PlayerBindPhone\022\020\n\010phone" + - "Num\030\001 \001(\t\022\r\n\005state\030\002 \001(\005\"3\n\014EndlessPoint" + - "\022\020\n\010location\030\001 \001(\005\022\021\n\tmonsterId\030\002 \001(\005\"2\n" + - "\014StrongerInfo\022\020\n\010curScore\030\001 \001(\005\022\020\n\010maxSc" + - "ore\030\002 \001(\005\"U\n\017QuestionOptions\022\017\n\007content\030", - "\001 \001(\t\022\014\n\004type\030\002 \001(\005\022\017\n\007options\030\003 \003(\t\022\022\n\n" + - "answerType\030\004 \001(\005\"\212\001\n\017BloodPersonInfo\022\n\n\002" + - "id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\021\n\theadFrame\030\003 \001(" + - "\005\022\014\n\004head\030\004 \001(\005\022\020\n\010serverId\030\005 \001(\005\022\r\n\005lev" + - "el\030\006 \001(\005\022\014\n\004rank\030\007 \001(\005\022\r\n\005score\030\010 \001(\005\"H\n" + - "\026LuckWheelRewardPosInfo\022\013\n\003pos\030\001 \001(\005\022\016\n\006" + - "luckId\030\002 \001(\005\022\021\n\tluckTimes\030\003 \001(\005\"l\n\013Refre" + - "shTask\022\014\n\004type\030\001 \001(\005\022:\n\005tasks\030\002 \003(\0132+.co" + - "m.ljsd.jieling.protocols.UserMissionInfo" + - "\022\023\n\013refreshTime\030\003 \001(\005\"\221\001\n\021MainLevelRankI", - "nfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\022\014\n\004name\030" + - "\003 \001(\t\022\017\n\007fightId\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\014\n\004" + - "rank\030\006 \001(\005\022\022\n\ntotalForce\030\007 \001(\005\022\021\n\theadFr" + - "ame\030\010 \001(\005\"B\n\017ChampionBetInfo\022\n\n\002id\030\001 \001(\t" + - "\022\020\n\010redCoins\030\002 \001(\005\022\021\n\tblueCoins\030\003 \001(\005\"\323\001" + - "\n\022ChampionBattleInfo\0227\n\006myInfo\030\001 \001(\0132\'.c" + - "om.ljsd.jieling.protocols.TeamOneInfo\022:\n" + - "\tenemyInfo\030\002 \001(\0132\'.com.ljsd.jieling.prot" + - "ocols.TeamOneInfo\022\016\n\006result\030\003 \001(\005\0228\n\tfig" + - "htData\030\004 \001(\0132%.com.ljsd.jieling.protocol", - "s.FightData\"\367\001\n\026ChampionBattlePairInfo\022;" + - "\n\nattackInfo\030\001 \001(\0132\'.com.ljsd.jieling.pr" + - "otocols.TeamOneInfo\0228\n\007defInfo\030\002 \001(\0132\'.c" + - "om.ljsd.jieling.protocols.TeamOneInfo\022\023\n" + - "\013fightResult\030\003 \001(\005\022\n\n\002id\030\004 \001(\t\022\022\n\nroundT" + - "Imes\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(\005\"q\n\nRedPackage\022\020\n\010u" + - "serName\030\001 \001(\t\022\r\n\005redId\030\002 \001(\005\022\r\n\005isGet\030\003 " + - "\001(\005\022\020\n\010getCount\030\004 \001(\005\022\017\n\007redType\030\005 \001(\005\022\020" + - "\n\010sendTime\030\006 \001(\005\"\211\001\n\014RedOneDetail\022\013\n\003uid", - "\030\001 \001(\005\022\014\n\004head\030\002 \001(\005\022\021\n\theadFrame\030\003 \001(\005\022" + - "\014\n\004name\030\004 \001(\t\022\014\n\004time\030\005 \001(\005\022\r\n\005count\030\006 \001" + - "(\005\022\016\n\006itemId\030\007 \001(\005\022\020\n\010position\030\010 \001(\005\"Z\n\030" + - "ExpeditionSimpleBossInfo\022\017\n\007heroTid\030\001 \001(" + - "\005\022\014\n\004star\030\002 \001(\005\022\r\n\005level\030\003 \001(\005\022\020\n\010remain" + - "Hp\030\004 \001(\001\"\202\001\n\022ExpeditionTeamInfo\022B\n\004hero\030" + - "\001 \003(\01324.com.ljsd.jieling.protocols.Exped" + - "itionSimpleBossInfo\022\024\n\014PokemonInfos\030\002 \003(" + - "\005\022\022\n\ntotalForce\030\003 \001(\005\"\251\001\n\022ExpeditionNode" + - "Info\022\016\n\006sortId\030\001 \001(\005\022\013\n\003lay\030\002 \001(\005\022\014\n\004typ", - "e\030\003 \001(\005\022D\n\014bossTeaminfo\030\004 \001(\0132..com.ljsd" + - ".jieling.protocols.ExpeditionTeamInfo\022\r\n" + - "\005state\030\005 \001(\005\022\023\n\013holyEquipID\030\006 \003(\005\"<\n\030Exp" + - "editionSimpleHeroInfo\022\016\n\006heroId\030\001 \001(\t\022\020\n" + - "\010remainHp\030\002 \001(\001\"/\n\017ExpeditionEquip\022\n\n\002id" + - "\030\001 \001(\t\022\020\n\010equiptId\030\002 \001(\005\"P\n\rMonthCardInf" + - "o\022\n\n\002id\030\001 \001(\005\022\022\n\nendingTime\030\002 \001(\005\022\r\n\005sta" + - "te\030\003 \001(\005\022\020\n\010totleAmt\030\004 \001(\005B\002H\001" + "\005\022\020\n\010position\030\005 \001(\005\"\207\001\n\017TeamOneTeamInfo\022" + + "8\n\004team\030\001 \003(\0132*.com.ljsd.jieling.protoco" + + "ls.TeamSimpleInfo\022\024\n\014PokemonInfos\030\002 \003(\005\022" + + "\022\n\ntotalForce\030\003 \001(\005\022\020\n\010remainHp\030\004 \003(\005\"\271\001" + + "\n\013TeamOneInfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001(" + + "\005\022\014\n\004name\030\003 \001(\t\022\014\n\004head\030\004 \001(\005\022\021\n\theadFra" + + "me\030\005 \001(\005\022\021\n\tguildName\030\007 \001(\t\0229\n\004team\030\006 \001(" + + "\0132+.com.ljsd.jieling.protocols.TeamOneTe" + + "amInfo\022\021\n\tisApplyed\030\010 \001(\005\"y\n\017MonsterRank", + "Info\022\014\n\004name\030\001 \001(\t\022\r\n\005score\030\002 \001(\005\022\014\n\004ran" + + "k\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\021\n\t" + + "headFrame\030\006 \001(\005\022\013\n\003uid\030\007 \001(\005\"2\n\rHeroBloo" + + "dInfo\022\016\n\006heroId\030\001 \001(\t\022\021\n\tlostBlood\030\002 \001(\005" + + "\"D\n\013EndlessInfo\022\r\n\005mapId\030\001 \001(\005\022\022\n\nworldL" + + "evel\030\002 \001(\005\022\022\n\nbloodScore\030\003 \001(\005\"2\n\017Player" + + "BindPhone\022\020\n\010phoneNum\030\001 \001(\t\022\r\n\005state\030\002 \001" + + "(\005\"3\n\014EndlessPoint\022\020\n\010location\030\001 \001(\005\022\021\n\t" + + "monsterId\030\002 \001(\005\"2\n\014StrongerInfo\022\020\n\010curSc" + + "ore\030\001 \001(\005\022\020\n\010maxScore\030\002 \001(\005\"U\n\017QuestionO", + "ptions\022\017\n\007content\030\001 \001(\t\022\014\n\004type\030\002 \001(\005\022\017\n" + + "\007options\030\003 \003(\t\022\022\n\nanswerType\030\004 \001(\005\"\212\001\n\017B" + + "loodPersonInfo\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t" + + "\022\021\n\theadFrame\030\003 \001(\005\022\014\n\004head\030\004 \001(\005\022\020\n\010ser" + + "verId\030\005 \001(\005\022\r\n\005level\030\006 \001(\005\022\014\n\004rank\030\007 \001(\005" + + "\022\r\n\005score\030\010 \001(\005\"H\n\026LuckWheelRewardPosInf" + + "o\022\013\n\003pos\030\001 \001(\005\022\016\n\006luckId\030\002 \001(\005\022\021\n\tluckTi" + + "mes\030\003 \001(\005\"l\n\013RefreshTask\022\014\n\004type\030\001 \001(\005\022:" + + "\n\005tasks\030\002 \003(\0132+.com.ljsd.jieling.protoco" + + "ls.UserMissionInfo\022\023\n\013refreshTime\030\003 \001(\005\"", + "\221\001\n\021MainLevelRankInfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005le" + + "vel\030\002 \001(\005\022\014\n\004name\030\003 \001(\t\022\017\n\007fightId\030\004 \001(\005" + + "\022\014\n\004head\030\005 \001(\005\022\014\n\004rank\030\006 \001(\005\022\022\n\ntotalFor" + + "ce\030\007 \001(\005\022\021\n\theadFrame\030\010 \001(\005\"B\n\017ChampionB" + + "etInfo\022\n\n\002id\030\001 \001(\t\022\020\n\010redCoins\030\002 \001(\005\022\021\n\t" + + "blueCoins\030\003 \001(\005\"\323\001\n\022ChampionBattleInfo\0227" + + "\n\006myInfo\030\001 \001(\0132\'.com.ljsd.jieling.protoc" + + "ols.TeamOneInfo\022:\n\tenemyInfo\030\002 \001(\0132\'.com" + + ".ljsd.jieling.protocols.TeamOneInfo\022\016\n\006r" + + "esult\030\003 \001(\005\0228\n\tfightData\030\004 \001(\0132%.com.ljs", + "d.jieling.protocols.FightData\"\367\001\n\026Champi" + + "onBattlePairInfo\022;\n\nattackInfo\030\001 \001(\0132\'.c" + + "om.ljsd.jieling.protocols.TeamOneInfo\0228\n" + + "\007defInfo\030\002 \001(\0132\'.com.ljsd.jieling.protoc" + + "ols.TeamOneInfo\022\023\n\013fightResult\030\003 \001(\005\022\n\n\002" + + "id\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(\005\"" + + "q\n\nRedPackage\022\020\n\010userName\030\001 \001(\t\022\r\n\005redId" + + "\030\002 \001(\005\022\r\n\005isGet\030\003 \001(\005\022\020\n\010getCount\030\004 \001(\005\022" + + "\017\n\007redType\030\005 \001(\005\022\020\n\010sendTime\030\006 \001(\005\"\211\001\n\014R", + "edOneDetail\022\013\n\003uid\030\001 \001(\005\022\014\n\004head\030\002 \001(\005\022\021" + + "\n\theadFrame\030\003 \001(\005\022\014\n\004name\030\004 \001(\t\022\014\n\004time\030" + + "\005 \001(\005\022\r\n\005count\030\006 \001(\005\022\016\n\006itemId\030\007 \001(\005\022\020\n\010" + + "position\030\010 \001(\005\"Z\n\030ExpeditionSimpleBossIn" + + "fo\022\017\n\007heroTid\030\001 \001(\005\022\014\n\004star\030\002 \001(\005\022\r\n\005lev" + + "el\030\003 \001(\005\022\020\n\010remainHp\030\004 \001(\001\"\202\001\n\022Expeditio" + + "nTeamInfo\022B\n\004hero\030\001 \003(\01324.com.ljsd.jieli" + + "ng.protocols.ExpeditionSimpleBossInfo\022\024\n" + + "\014PokemonInfos\030\002 \003(\005\022\022\n\ntotalForce\030\003 \001(\005\"" + + "\251\001\n\022ExpeditionNodeInfo\022\016\n\006sortId\030\001 \001(\005\022\013", + "\n\003lay\030\002 \001(\005\022\014\n\004type\030\003 \001(\005\022D\n\014bossTeaminf" + + "o\030\004 \001(\0132..com.ljsd.jieling.protocols.Exp" + + "editionTeamInfo\022\r\n\005state\030\005 \001(\005\022\023\n\013holyEq" + + "uipID\030\006 \003(\005\"<\n\030ExpeditionSimpleHeroInfo\022" + + "\016\n\006heroId\030\001 \001(\t\022\020\n\010remainHp\030\002 \001(\001\"/\n\017Exp" + + "editionEquip\022\n\n\002id\030\001 \001(\t\022\020\n\010equiptId\030\002 \001" + + "(\005\"P\n\rMonthCardInfo\022\n\n\002id\030\001 \001(\005\022\022\n\nendin" + + "gTime\030\002 \001(\005\022\r\n\005state\030\003 \001(\005\022\020\n\010totleAmt\030\004" + + " \001(\005B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -90631,7 +90713,7 @@ public final class CommonProto { internal_static_com_ljsd_jieling_protocols_TeamSimpleInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_TeamSimpleInfo_descriptor, - new java.lang.String[] { "Heroid", "HeroTid", "Star", "Level", }); + new java.lang.String[] { "Heroid", "HeroTid", "Star", "Level", "Position", }); internal_static_com_ljsd_jieling_protocols_TeamOneTeamInfo_descriptor = getDescriptor().getMessageTypes().get(73); internal_static_com_ljsd_jieling_protocols_TeamOneTeamInfo_fieldAccessorTable = new diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index 8f5e79204..7d46d3f56 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -149,7 +149,7 @@ public class GuildFightLogic { } for(TeamPosHeroInfo heroInfo:teamPosHeroInfos){ Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId()); - oneInfo.addTeam(CBean2Proto.getSimpleTeamInfoByHero(hero)); + oneInfo.addTeam(CBean2Proto.getSimpleTeamInfoByHero(hero,heroInfo.getPosition())); } int force = HeroLogic.getInstance().calTeamTotalForce(user, 501, false); if(force==0){ 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 14d7f9355..08fbfbfeb 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 @@ -536,7 +536,7 @@ public class PlayerLogic { if(teamPosManager.getTeamPosForHero().containsKey(teamId)){ for (TeamPosHeroInfo heroInfo:teamPosManager.getTeamPosForHero().get(teamId)) { Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId()); - teamInfo.addTeam(CBean2Proto.getSimpleTeamInfoByHero(hero)); + teamInfo.addTeam(CBean2Proto.getSimpleTeamInfoByHero(hero,heroInfo.getPosition())); } } int guildId = user.getPlayerInfoManager().getGuildId(); @@ -564,10 +564,11 @@ public class PlayerLogic { } } teamInfo.setTotalForce(sArenaRobotConfig.getTotalForce()); + int position = 1; for(Map.Entry item : sArenaRobotConfig.getStarOfHeroMap().entrySet()){ Integer heroTid = item.getKey(); Integer heroStar = item.getValue(); - teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder().setHeroid(String.valueOf(heroTid)).setHeroTid(heroTid).setLevel(sArenaRobotConfig.getRoleLv()).setStar(heroStar).build()); + teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder().setHeroid(String.valueOf(heroTid)).setHeroTid(heroTid).setLevel(sArenaRobotConfig.getRoleLv()).setStar(heroStar).setPosition(position++).build()); } oneInfo.setTeam(teamInfo); return oneInfo; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 47692d95b..a8880fbe4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -540,7 +540,7 @@ public class CBean2Proto { } - public static CommonProto.TeamSimpleInfo getSimpleTeamInfoByHero(Hero hero){ - return CommonProto.TeamSimpleInfo.newBuilder().setHeroid(hero.getId()).setHeroTid(hero.getTemplateId()).setLevel(hero.getLevel()).setStar(hero.getStar()).build(); + public static CommonProto.TeamSimpleInfo getSimpleTeamInfoByHero(Hero hero,int position){ + return CommonProto.TeamSimpleInfo.newBuilder().setHeroid(hero.getId()).setHeroTid(hero.getTemplateId()).setLevel(hero.getLevel()).setStar(hero.getStar()).setPosition(position).build(); } }