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 865798c83..4f6d83f93 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java @@ -9914,6 +9914,24 @@ public final class CommonProto { */ com.google.protobuf.ByteString getPropertyBytes(); + + // optional int32 position = 4; + /** + * optional int32 position = 4; + * + *
+     * 位置
+     * 
+ */ + boolean hasPosition(); + /** + * optional int32 position = 4; + * + *
+     * 位置
+     * 
+ */ + int getPosition(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.FightUnitInfo} @@ -9981,6 +9999,11 @@ public final class CommonProto { property_ = input.readBytes(); break; } + case 32: { + bitField0_ |= 0x00000008; + position_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -10186,10 +10209,35 @@ public final class CommonProto { } } + // optional int32 position = 4; + public static final int POSITION_FIELD_NUMBER = 4; + private int position_; + /** + * optional int32 position = 4; + * + *
+     * 位置
+     * 
+ */ + public boolean hasPosition() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional int32 position = 4; + * + *
+     * 位置
+     * 
+ */ + public int getPosition() { + return position_; + } + private void initFields() { unitId_ = ""; unitSkillIds_ = ""; property_ = ""; + position_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -10212,6 +10260,9 @@ public final class CommonProto { if (((bitField0_ & 0x00000004) == 0x00000004)) { output.writeBytes(3, getPropertyBytes()); } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeInt32(4, position_); + } getUnknownFields().writeTo(output); } @@ -10233,6 +10284,10 @@ public final class CommonProto { size += com.google.protobuf.CodedOutputStream .computeBytesSize(3, getPropertyBytes()); } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(4, position_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -10355,6 +10410,8 @@ public final class CommonProto { bitField0_ = (bitField0_ & ~0x00000002); property_ = ""; bitField0_ = (bitField0_ & ~0x00000004); + position_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -10395,6 +10452,10 @@ public final class CommonProto { to_bitField0_ |= 0x00000004; } result.property_ = property_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + result.position_ = position_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -10426,6 +10487,9 @@ public final class CommonProto { property_ = other.property_; onChanged(); } + if (other.hasPosition()) { + setPosition(other.getPosition()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -10747,6 +10811,55 @@ public final class CommonProto { return this; } + // optional int32 position = 4; + private int position_ ; + /** + * optional int32 position = 4; + * + *
+       * 位置
+       * 
+ */ + public boolean hasPosition() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional int32 position = 4; + * + *
+       * 位置
+       * 
+ */ + public int getPosition() { + return position_; + } + /** + * optional int32 position = 4; + * + *
+       * 位置
+       * 
+ */ + public Builder setPosition(int value) { + bitField0_ |= 0x00000008; + position_ = value; + onChanged(); + return this; + } + /** + * optional int32 position = 4; + * + *
+       * 位置
+       * 
+ */ + public Builder clearPosition() { + bitField0_ = (bitField0_ & ~0x00000008); + position_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.FightUnitInfo) } @@ -89581,240 +89694,241 @@ public final class CommonProto { "dList\030\010 \003(\t\022\022\n\ncreateTime\030\t \001(\005\022\023\n\013starB" + "reakId\030\n \001(\005\022\032\n\022especialEquipLevel\030\013 \001(\005" + "\0224\n\007soulPos\030\014 \003(\0132#.com.ljsd.jieling.pro" + - "tocols.SoulPos\022\021\n\tlockState\030\r \001(\005\"G\n\rFig" + + "tocols.SoulPos\022\021\n\tlockState\030\r \001(\005\"Y\n\rFig" + "htUnitInfo\022\016\n\006unitId\030\001 \001(\t\022\024\n\014unitSkillI" + - "ds\030\002 \001(\t\022\020\n\010property\030\003 \001(\t\"\201\001\n\rFightTeam" + - "Info\022@\n\rfightUnitList\030\001 \003(\0132).com.ljsd.j" + - "ieling.protocols.FightUnitInfo\022\025\n\rteamSk" + - "illList\030\002 \001(\t\022\027\n\017teamPassiveList\030\003 \001(\t\"-" + - "\n\023EventBehaviorValues\022\026\n\016behaviorValues\030", - "\001 \003(\005\"y\n\023EventBehaviorCommon\022\024\n\014behavior" + - "Type\030\001 \001(\005\022L\n\023eventBehaviorValues\030\002 \003(\0132" + - "/.com.ljsd.jieling.protocols.EventBehavi" + - "orValues\"=\n\004Cell\022\016\n\006cellId\030\001 \001(\005\022\017\n\007poin" + - "tId\030\002 \001(\005\022\024\n\014monsterForce\030\003 \001(\005\"^\n\007Missi" + - "on\022\016\n\006itemId\030\001 \001(\005\022\r\n\005state\030\002 \001(\t\022\023\n\013mis" + - "sionStep\030\003 \001(\005\022\014\n\004time\030\004 \001(\005\022\021\n\tdeadTime" + - "s\030\005 \001(\005\"\243\001\n\004Mail\022\016\n\006mailId\030\001 \001(\t\022\r\n\005stat" + - "e\030\002 \001(\005\022\014\n\004head\030\003 \001(\t\022\017\n\007content\030\004 \001(\t\022\020" + - "\n\010mailItem\030\005 \001(\t\022\020\n\010sendTime\030\006 \001(\005\022\025\n\ref", - "fectiveTime\030\007 \001(\005\022\020\n\010sendName\030\010 \001(\t\022\020\n\010m" + - "ailType\030\t \001(\005\"\324\001\n\004Drop\0222\n\010itemlist\030\001 \003(\013" + - "2 .com.ljsd.jieling.protocols.Item\0222\n\007eq" + - "uipId\030\002 \003(\0132!.com.ljsd.jieling.protocols" + - ".Equip\022.\n\004Hero\030\003 \003(\0132 .com.ljsd.jieling." + - "protocols.Hero\0224\n\tsoulEquip\030\004 \003(\0132!.com." + - "ljsd.jieling.protocols.Equip\"\034\n\tGMComman" + - "d\022\017\n\007command\030\001 \001(\t\"0\n\014TeamHeroInfo\022\020\n\010po" + - "sition\030\001 \001(\005\022\016\n\006heroId\030\002 \001(\t\"6\n\017TeamPoke" + - "monInfo\022\020\n\010position\030\001 \001(\005\022\021\n\tpokemonId\030\002", - " \001(\005\"\267\001\n\013TeamPosInfo\022\016\n\006teamId\030\001 \001(\005\022\020\n\010" + - "teamName\030\002 \001(\t\022?\n\rteamHeroInfos\030\003 \003(\0132(." + - "com.ljsd.jieling.protocols.TeamHeroInfo\022" + - "E\n\020teamPokemonInfos\030\004 \003(\0132+.com.ljsd.jie" + - "ling.protocols.TeamPokemonInfo\"-\n\020Pokemo" + - "ncomonpent\022\n\n\002id\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\"p\n" + - "\013PokemonInfo\022\n\n\002id\030\001 \001(\005\022\r\n\005stage\030\002 \001(\005\022" + - "F\n\020pokemoncomonpent\030\003 \003(\0132,.com.ljsd.jie" + - "ling.protocols.Pokemoncomonpent\">\n\014RingF" + - "ireInfo\022\n\n\002id\030\001 \001(\005\022\r\n\005stage\030\002 \001(\005\022\023\n\013co", - "monpentId\030\003 \003(\005\"<\n\020WorkShopBaseInfo\022\014\n\004t" + - "ype\030\001 \001(\005\022\r\n\005levle\030\002 \001(\005\022\013\n\003exp\030\003 \001(\005\".\n" + - "\022WorkShopUnLockInfo\022\014\n\004type\030\001 \001(\005\022\n\n\002id\030" + - "\004 \003(\005\"\312\001\n\tFightData\022A\n\016heroFightInfos\030\001 " + - "\001(\0132).com.ljsd.jieling.protocols.FightTe" + - "amInfo\022>\n\013monsterList\030\002 \003(\0132).com.ljsd.j" + - "ieling.protocols.FightTeamInfo\022\021\n\tfightS" + - "eed\030\003 \001(\005\022\024\n\014fightMaxTime\030\004 \001(\005\022\021\n\tfight" + - "Type\030\005 \001(\005\"-\n\rExploreDetail\022\n\n\002id\030\001 \001(\005\022" + - "\020\n\010progress\030\002 \001(\005\"0\n\nFoodBuffer\022\020\n\010buffe", - "rId\030\001 \001(\005\022\020\n\010leftStep\030\002 \001(\005\"/\n\023NewPlayer" + - "GuidePoint\022\014\n\004type\030\001 \001(\005\022\n\n\002id\030\002 \001(\005\"L\n\017" + - "LevelDifficulty\022\017\n\007fightId\030\001 \001(\005\022\r\n\005stat" + - "e\030\002 \001(\005\022\013\n\003num\030\003 \001(\005\022\014\n\004type\030\004 \001(\005\"l\n\024Le" + - "velDifficultyInfos\022\016\n\006areaId\030\001 \001(\005\022D\n\017Le" + - "velDifficulty\030\002 \003(\0132+.com.ljsd.jieling.p" + - "rotocols.LevelDifficulty\":\n\007MapInfo\022\r\n\005m" + - "apId\030\001 \001(\005\022\021\n\tleastTime\030\002 \001(\005\022\r\n\005stars\030\003" + - " \003(\005\"\363\001\n\014ActivityInfo\022\022\n\nactivityId\030\001 \002(" + - "\005\022E\n\007mission\030\002 \003(\01324.com.ljsd.jieling.pr", - "otocols.ActivityInfo.MissionInfo\022\r\n\005valu" + - "e\030\006 \001(\005\022\021\n\tstartTime\030\005 \001(\005\022\017\n\007endTime\030\003 " + - "\001(\005\022\022\n\nreallyOpen\030\004 \001(\005\032A\n\013MissionInfo\022\021" + - "\n\tmissionId\030\001 \002(\005\022\020\n\010progress\030\002 \002(\005\022\r\n\005s" + - "tate\030\003 \002(\005\"J\n\nGmResponse\022.\n\004drop\030\001 \001(\0132 " + - ".com.ljsd.jieling.protocols.Drop\022\014\n\004info" + - "\030\002 \001(\t\"\215\001\n\017ArenaPersonInfo\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\r\n\005score\030\004 " + - "\001(\005\022\014\n\004head\030\005 \001(\005\022\014\n\004rank\030\006 \001(\005\022\022\n\ntotal" + - "Force\030\007 \001(\005\022\021\n\theadFrame\030\010 \001(\005\"\027\n\004Team\022\017", - "\n\007heroTid\030\001 \003(\005\"}\n\nArenaEnemy\022?\n\npersonI" + - "nfo\030\001 \001(\0132+.com.ljsd.jieling.protocols.A" + - "renaPersonInfo\022.\n\004team\030\002 \001(\0132 .com.ljsd." + - "jieling.protocols.Team\"~\n\tArenaInfo\022\020\n\010f" + - "ailNums\030\001 \001(\005\022\023\n\013successNums\030\002 \001(\005\022\r\n\005sc" + - "ore\030\003 \001(\005\022;\n\013arenaEnemys\030\004 \003(\0132&.com.ljs" + - "d.jieling.protocols.ArenaEnemy\"\'\n\tStoreI" + - "tem\022\n\n\002id\030\001 \001(\005\022\016\n\006buyNum\030\002 \001(\005\"\216\001\n\tStor" + - "eInfo\022\n\n\002id\030\001 \001(\005\022\027\n\017lastRefreshTime\030\002 \001" + - "(\003\022\021\n\tstartTime\030\004 \001(\003\022\017\n\007endTime\030\005 \001(\003\0228", - "\n\tstoreItem\030\006 \003(\0132%.com.ljsd.jieling.pro" + - "tocols.StoreItem\"\236\001\n\017ArenaRecordInfo\022\n\n\002" + - "id\030\001 \001(\t\022?\n\nattackInfo\030\002 \001(\0132+.com.ljsd." + - "jieling.protocols.ArenaPersonInfo\022\022\n\natt" + - "ackTime\030\003 \001(\005\022\025\n\rmyScoreChange\030\004 \001(\005\022\023\n\013" + - "fightResult\030\005 \001(\005\"Z\n\016FunctionOfTime\022\022\n\nf" + - "unctionId\030\001 \001(\005\022\021\n\tstartTime\030\002 \001(\005\022\017\n\007en" + - "dTime\030\003 \001(\005\022\020\n\010interval\030\004 \001(\005\"~\n\025Adventu" + - "reRankItemInfo\022\r\n\005level\030\001 \001(\005\022\014\n\004name\030\002 " + - "\001(\t\022\014\n\004hurt\030\003 \001(\005\022\014\n\004head\030\004 \001(\005\022\014\n\004rank\030", - "\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\022\013\n\003uid\030\007 \001(\005\"\313\001" + - "\n\021AdventureBossInfo\022\017\n\007arenaId\030\001 \001(\005\022\017\n\007" + - "findUid\030\002 \001(\005\022\020\n\010findName\030\003 \001(\t\022\016\n\006bossI" + - "d\030\004 \001(\t\022\023\n\013bossGroupId\030\005 \001(\005\022\016\n\006myHurt\030\006" + - " \001(\005\022\021\n\tlevelTime\030\007 \001(\005\022\017\n\007totalHp\030\010 \001(\005" + - "\022\025\n\rbossRemainlHp\030\t \001(\005\022\022\n\narenaLevel\030\n " + - "\001(\005\"v\n\017UserMissionInfo\022\021\n\tmissionId\030\001 \001(" + - "\005\022\020\n\010progress\030\002 \001(\005\022\r\n\005state\030\003 \001(\005\022\014\n\004ty" + - "pe\030\004 \001(\005\022\021\n\ttakeTimes\030\005 \001(\005\022\016\n\006heroId\030\006 " + - "\003(\t\"8\n\013VipBaseInfo\022\020\n\010vipLevel\030\001 \001(\005\022\027\n\017", - "hadTakeLevelBox\030\002 \001(\005\"\250\001\n\006Friend\022\n\n\002id\030\001" + - " \001(\005\022\014\n\004name\030\002 \001(\t\022\n\n\002lv\030\003 \001(\005\022\023\n\013offLin" + - "eTime\030\004 \001(\004\022\022\n\nhaveReward\030\005 \001(\005\022\016\n\006isGiv" + - "e\030\006 \001(\005\022\021\n\tisApplyed\030\007 \001(\005\022\014\n\004head\030\014 \001(\005" + - "\022\r\n\005frame\030\r \001(\005\022\017\n\007soulVal\030\016 \001(\005\"o\n\rGift" + - "GoodsInfo\022\017\n\007goodsId\030\001 \001(\005\022\020\n\010buyTimes\030\002" + - " \001(\005\022\021\n\tstartTime\030\003 \001(\005\022\017\n\007endTime\030\004 \001(\005" + - "\022\027\n\017dynamicBuyTimes\030\005 \001(\005\"7\n\021GoodsTypeDu" + - "ration\022\021\n\tgoodsType\030\001 \001(\005\022\017\n\007endTime\030\002 \001" + - "(\005\"/\n\016TechnologyInfo\022\016\n\006techId\030\001 \001(\005\022\r\n\005", - "levle\030\002 \001(\005\"J\n\020SuddenlyBossInfo\022\022\n\nsuddB" + - "ossId\030\006 \001(\005\022\017\n\007endTime\030\007 \001(\005\022\021\n\tfindMapI" + - "d\030\010 \001(\005\"H\n\010ItemInfo\022\022\n\ntemplateId\030\001 \001(\005\022" + - "\017\n\007overlap\030\002 \001(\005\022\027\n\017nextRefreshTime\030\003 \001(" + - "\005\"H\n\010RankInfo\022\014\n\004rank\030\001 \001(\005\022\016\n\006param1\030\002 " + - "\001(\005\022\016\n\006param2\030\003 \001(\005\022\016\n\006param3\030\004 \001(\005\"\306\001\n\010" + - "UserRank\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\022\014\n\004" + - "head\030\003 \001(\005\022\020\n\010userName\030\004 \001(\t\0226\n\010rankInfo" + - "\030\005 \001(\0132$.com.ljsd.jieling.protocols.Rank" + - "Info\022\021\n\theadFrame\030\006 \001(\005\022\021\n\tguildName\030\007 \001", - "(\t\022\r\n\005force\030\010 \001(\005\022\021\n\tguildSign\030\t \001(\005\"\204\001\n" + - "\025ActorEffectBufferInfo\022\n\n\002id\030\001 \001(\005\022\014\n\004ty" + - "pe\030\002 \001(\005\022\021\n\tstartTime\030\003 \001(\005\022\017\n\007endTime\030\004" + - " \001(\005\022\016\n\006target\030\005 \001(\005\022\016\n\006caster\030\006 \001(\005\022\r\n\005" + - "value\030\007 \003(\005\"T\n\016BloodyHeroInfo\022\016\n\006heroId\030" + - "\001 \001(\t\022\016\n\006heroHp\030\002 \001(\005\022\021\n\theroMaxHp\030\003 \001(\005" + - "\022\017\n\007heroTid\030\004 \001(\005\"%\n\010SceneMsg\022\014\n\004time\030\001 " + - "\001(\005\022\013\n\003msg\030\002 \001(\t\"\'\n\nPosMineral\022\013\n\003pos\030\001 " + - "\001(\005\022\014\n\004nums\030\002 \001(\005\"\264\001\n\010Creature\022\014\n\004path\030\001" + - " \003(\005\022\r\n\005speed\030\002 \001(\005\022\r\n\005maxHp\030\003 \001(\005\022\r\n\005cu", - "rHp\030\004 \001(\005\022\017\n\007mineral\030\005 \001(\005\022\014\n\004camp\030\006 \001(\005" + - "\022<\n\010heroInfo\030\007 \003(\0132*.com.ljsd.jieling.pr" + - "otocols.BloodyHeroInfo\022\020\n\010killNums\030\010 \001(\005" + - "\"\217\001\n\nSceneActor\022\n\n\002id\030\001 \001(\005\022\016\n\006curPos\030\002 " + - "\001(\005\022\r\n\005state\030\003 \001(\005\022\014\n\004type\030\004 \001(\005\0226\n\010Crea" + - "ture\030\006 \001(\0132$.com.ljsd.jieling.protocols." + - "Creature\022\020\n\010userName\030\007 \001(\t\"\236\002\n\tSceneInfo" + - "\022\016\n\006roomId\030\001 \001(\005\022\r\n\005mapId\030\002 \001(\005\022:\n\nScene" + - "Actor\030\003 \003(\0132&.com.ljsd.jieling.protocols" + - ".SceneActor\022P\n\025actorEffectBufferInfo\030\004 \003", - "(\01321.com.ljsd.jieling.protocols.ActorEff" + - "ectBufferInfo\022\024\n\014barrierPoint\030\005 \003(\005\022:\n\np" + - "osMineral\030\006 \003(\0132&.com.ljsd.jieling.proto" + - "cols.PosMineral\022\022\n\nremainTime\030\007 \001(\005\"S\n\027S" + - "ceneGetFullMsgResponse\0228\n\tsceneInfo\030\001 \001(" + - "\0132%.com.ljsd.jieling.protocols.SceneInfo" + - "\"B\n\013blessReward\022\022\n\nlocationId\030\001 \001(\005\022\r\n\005s" + - "tate\030\002 \001(\005\022\020\n\010rewardId\030\003 \001(\005\"5\n\022fiveRese" + - "tTowerInfo\022\r\n\005tower\030\001 \001(\005\022\020\n\010intoType\030\002 " + - "\001(\005\";\n\020FamilyContribute\022\013\n\003win\030\001 \001(\005\022\014\n\004", - "draw\030\002 \001(\005\022\014\n\004fail\030\003 \001(\005\"\210\002\n\016FamilyBaseI" + - "nfo\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\017\n\007annouce" + - "\030\003 \001(\t\022\r\n\005levle\030\004 \001(\005\022\013\n\003exp\030\005 \001(\005\022\020\n\010to" + - "talNum\030\006 \001(\005\022\016\n\006maxNum\030\007 \001(\005\022\020\n\010joinType" + - "\030\010 \001(\005\022\014\n\004icon\030\t \001(\005\022\021\n\tlevelTime\030\n \001(\005\022" + - "A\n\013fightResult\030\013 \001(\0132,.com.ljsd.jieling." + - "protocols.FamilyContribute\022\027\n\017playerInto" + - "Level\030\014 \001(\005\")\n\013endlessHero\022\016\n\006heroId\030\001 \001" + - "(\t\022\n\n\002hp\030\002 \001(\005\"2\n\022EndlessRefreshInfo\022\016\n\006" + - "cellId\030\001 \001(\005\022\014\n\004time\030\002 \001(\005\"u\n\014UseForceIn", - "fo\022\014\n\004name\030\001 \001(\t\022\014\n\004leve\030\002 \001(\005\022\r\n\005force\030" + - "\003 \001(\005\022\014\n\004rank\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\021\n\thea" + - "dFrame\030\006 \001(\005\022\013\n\003uid\030\007 \001(\005\"H\n\013endlessSign" + - "\022\r\n\005mapId\030\001 \001(\005\022\016\n\006cellId\030\002 \001(\005\022\014\n\004info\030" + - "\003 \001(\t\022\014\n\004type\030\004 \001(\005\"g\n\nExpertInfo\022\014\n\004nam" + - "e\030\001 \001(\t\022\r\n\005score\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\022\r\n\005" + - "level\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\005stat" + - "e\030\002 \001(\005\"N\n\016TeamSimpleInfo\022\016\n\006heroid\030\001 \001(" + - "\t\022\017\n\007heroTid\030\002 \001(\005\022\014\n\004star\030\003 \001(\005\022\r\n\005leve", - "l\030\004 \001(\005\"\207\001\n\017TeamOneTeamInfo\0228\n\004team\030\001 \003(" + - "\0132*.com.ljsd.jieling.protocols.TeamSimpl" + - "eInfo\022\024\n\014PokemonInfos\030\002 \003(\005\022\022\n\ntotalForc" + - "e\030\003 \001(\005\022\020\n\010remainHp\030\004 \003(\005\"\271\001\n\013TeamOneInf" + - "o\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\theadFrame\030\005 \001(\005\022\021\n\t" + - "guildName\030\007 \001(\t\0229\n\004team\030\006 \001(\0132+.com.ljsd" + - ".jieling.protocols.TeamOneTeamInfo\022\021\n\tis" + - "Applyed\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\005l", - "evel\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\006her" + - "oId\030\001 \001(\t\022\021\n\tlostBlood\030\002 \001(\005\"D\n\013EndlessI" + - "nfo\022\r\n\005mapId\030\001 \001(\005\022\022\n\nworldLevel\030\002 \001(\005\022\022" + - "\n\nbloodScore\030\003 \001(\005\"2\n\017PlayerBindPhone\022\020\n" + - "\010phoneNum\030\001 \001(\t\022\r\n\005state\030\002 \001(\005\"3\n\014Endles" + - "sPoint\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" + - "\010maxScore\030\002 \001(\005\"U\n\017QuestionOptions\022\017\n\007co" + - "ntent\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\017BloodPersonIn" + - "fo\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\021\n\theadFram" + - "e\030\003 \001(\005\022\014\n\004head\030\004 \001(\005\022\020\n\010serverId\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\026LuckWheelRewardPosInfo\022\013\n\003pos\030\001 \001" + - "(\005\022\016\n\006luckId\030\002 \001(\005\022\021\n\tluckTimes\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.protocols.UserMissi" + - "onInfo\022\023\n\013refreshTime\030\003 \001(\005\"\221\001\n\021MainLeve" + - "lRankInfo\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\004rank\030\006 \001(\005\022\022\n\ntotalForce\030\007 \001(\005\022\021\n\t" + - "headFrame\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" + + "ds\030\002 \001(\t\022\020\n\010property\030\003 \001(\t\022\020\n\010position\030\004" + + " \001(\005\"\201\001\n\rFightTeamInfo\022@\n\rfightUnitList\030" + + "\001 \003(\0132).com.ljsd.jieling.protocols.Fight" + + "UnitInfo\022\025\n\rteamSkillList\030\002 \001(\t\022\027\n\017teamP" + + "assiveList\030\003 \001(\t\"-\n\023EventBehaviorValues\022", + "\026\n\016behaviorValues\030\001 \003(\005\"y\n\023EventBehavior" + + "Common\022\024\n\014behaviorType\030\001 \001(\005\022L\n\023eventBeh" + + "aviorValues\030\002 \003(\0132/.com.ljsd.jieling.pro" + + "tocols.EventBehaviorValues\"=\n\004Cell\022\016\n\006ce" + + "llId\030\001 \001(\005\022\017\n\007pointId\030\002 \001(\005\022\024\n\014monsterFo" + + "rce\030\003 \001(\005\"^\n\007Mission\022\016\n\006itemId\030\001 \001(\005\022\r\n\005" + + "state\030\002 \001(\t\022\023\n\013missionStep\030\003 \001(\005\022\014\n\004time" + + "\030\004 \001(\005\022\021\n\tdeadTimes\030\005 \001(\005\"\243\001\n\004Mail\022\016\n\006ma" + + "ilId\030\001 \001(\t\022\r\n\005state\030\002 \001(\005\022\014\n\004head\030\003 \001(\t\022" + + "\017\n\007content\030\004 \001(\t\022\020\n\010mailItem\030\005 \001(\t\022\020\n\010se", + "ndTime\030\006 \001(\005\022\025\n\reffectiveTime\030\007 \001(\005\022\020\n\010s" + + "endName\030\010 \001(\t\022\020\n\010mailType\030\t \001(\005\"\324\001\n\004Drop" + + "\0222\n\010itemlist\030\001 \003(\0132 .com.ljsd.jieling.pr" + + "otocols.Item\0222\n\007equipId\030\002 \003(\0132!.com.ljsd" + + ".jieling.protocols.Equip\022.\n\004Hero\030\003 \003(\0132 " + + ".com.ljsd.jieling.protocols.Hero\0224\n\tsoul" + + "Equip\030\004 \003(\0132!.com.ljsd.jieling.protocols" + + ".Equip\"\034\n\tGMCommand\022\017\n\007command\030\001 \001(\t\"0\n\014" + + "TeamHeroInfo\022\020\n\010position\030\001 \001(\005\022\016\n\006heroId" + + "\030\002 \001(\t\"6\n\017TeamPokemonInfo\022\020\n\010position\030\001 ", + "\001(\005\022\021\n\tpokemonId\030\002 \001(\005\"\267\001\n\013TeamPosInfo\022\016" + + "\n\006teamId\030\001 \001(\005\022\020\n\010teamName\030\002 \001(\t\022?\n\rteam" + + "HeroInfos\030\003 \003(\0132(.com.ljsd.jieling.proto" + + "cols.TeamHeroInfo\022E\n\020teamPokemonInfos\030\004 " + + "\003(\0132+.com.ljsd.jieling.protocols.TeamPok" + + "emonInfo\"-\n\020Pokemoncomonpent\022\n\n\002id\030\001 \001(\005" + + "\022\r\n\005level\030\002 \001(\005\"p\n\013PokemonInfo\022\n\n\002id\030\001 \001" + + "(\005\022\r\n\005stage\030\002 \001(\005\022F\n\020pokemoncomonpent\030\003 " + + "\003(\0132,.com.ljsd.jieling.protocols.Pokemon" + + "comonpent\">\n\014RingFireInfo\022\n\n\002id\030\001 \001(\005\022\r\n", + "\005stage\030\002 \001(\005\022\023\n\013comonpentId\030\003 \003(\005\"<\n\020Wor" + + "kShopBaseInfo\022\014\n\004type\030\001 \001(\005\022\r\n\005levle\030\002 \001" + + "(\005\022\013\n\003exp\030\003 \001(\005\".\n\022WorkShopUnLockInfo\022\014\n" + + "\004type\030\001 \001(\005\022\n\n\002id\030\004 \003(\005\"\312\001\n\tFightData\022A\n" + + "\016heroFightInfos\030\001 \001(\0132).com.ljsd.jieling" + + ".protocols.FightTeamInfo\022>\n\013monsterList\030" + + "\002 \003(\0132).com.ljsd.jieling.protocols.Fight" + + "TeamInfo\022\021\n\tfightSeed\030\003 \001(\005\022\024\n\014fightMaxT" + + "ime\030\004 \001(\005\022\021\n\tfightType\030\005 \001(\005\"-\n\rExploreD" + + "etail\022\n\n\002id\030\001 \001(\005\022\020\n\010progress\030\002 \001(\005\"0\n\nF", + "oodBuffer\022\020\n\010bufferId\030\001 \001(\005\022\020\n\010leftStep\030" + + "\002 \001(\005\"/\n\023NewPlayerGuidePoint\022\014\n\004type\030\001 \001" + + "(\005\022\n\n\002id\030\002 \001(\005\"L\n\017LevelDifficulty\022\017\n\007fig" + + "htId\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\022\013\n\003num\030\003 \001(\005\022\014" + + "\n\004type\030\004 \001(\005\"l\n\024LevelDifficultyInfos\022\016\n\006" + + "areaId\030\001 \001(\005\022D\n\017LevelDifficulty\030\002 \003(\0132+." + + "com.ljsd.jieling.protocols.LevelDifficul" + + "ty\":\n\007MapInfo\022\r\n\005mapId\030\001 \001(\005\022\021\n\tleastTim" + + "e\030\002 \001(\005\022\r\n\005stars\030\003 \003(\005\"\363\001\n\014ActivityInfo\022" + + "\022\n\nactivityId\030\001 \002(\005\022E\n\007mission\030\002 \003(\01324.c", + "om.ljsd.jieling.protocols.ActivityInfo.M" + + "issionInfo\022\r\n\005value\030\006 \001(\005\022\021\n\tstartTime\030\005" + + " \001(\005\022\017\n\007endTime\030\003 \001(\005\022\022\n\nreallyOpen\030\004 \001(" + + "\005\032A\n\013MissionInfo\022\021\n\tmissionId\030\001 \002(\005\022\020\n\010p" + + "rogress\030\002 \002(\005\022\r\n\005state\030\003 \002(\005\"J\n\nGmRespon" + + "se\022.\n\004drop\030\001 \001(\0132 .com.ljsd.jieling.prot" + + "ocols.Drop\022\014\n\004info\030\002 \001(\t\"\215\001\n\017ArenaPerson" + + "Info\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\r\n\005score\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\014\n\004r" + + "ank\030\006 \001(\005\022\022\n\ntotalForce\030\007 \001(\005\022\021\n\theadFra", + "me\030\010 \001(\005\"\027\n\004Team\022\017\n\007heroTid\030\001 \003(\005\"}\n\nAre" + + "naEnemy\022?\n\npersonInfo\030\001 \001(\0132+.com.ljsd.j" + + "ieling.protocols.ArenaPersonInfo\022.\n\004team" + + "\030\002 \001(\0132 .com.ljsd.jieling.protocols.Team" + + "\"~\n\tArenaInfo\022\020\n\010failNums\030\001 \001(\005\022\023\n\013succe" + + "ssNums\030\002 \001(\005\022\r\n\005score\030\003 \001(\005\022;\n\013arenaEnem" + + "ys\030\004 \003(\0132&.com.ljsd.jieling.protocols.Ar" + + "enaEnemy\"\'\n\tStoreItem\022\n\n\002id\030\001 \001(\005\022\016\n\006buy" + + "Num\030\002 \001(\005\"\216\001\n\tStoreInfo\022\n\n\002id\030\001 \001(\005\022\027\n\017l" + + "astRefreshTime\030\002 \001(\003\022\021\n\tstartTime\030\004 \001(\003\022", + "\017\n\007endTime\030\005 \001(\003\0228\n\tstoreItem\030\006 \003(\0132%.co" + + "m.ljsd.jieling.protocols.StoreItem\"\236\001\n\017A" + + "renaRecordInfo\022\n\n\002id\030\001 \001(\t\022?\n\nattackInfo" + + "\030\002 \001(\0132+.com.ljsd.jieling.protocols.Aren" + + "aPersonInfo\022\022\n\nattackTime\030\003 \001(\005\022\025\n\rmySco" + + "reChange\030\004 \001(\005\022\023\n\013fightResult\030\005 \001(\005\"Z\n\016F" + + "unctionOfTime\022\022\n\nfunctionId\030\001 \001(\005\022\021\n\tsta" + + "rtTime\030\002 \001(\005\022\017\n\007endTime\030\003 \001(\005\022\020\n\010interva" + + "l\030\004 \001(\005\"~\n\025AdventureRankItemInfo\022\r\n\005leve" + + "l\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\014\n\004hurt\030\003 \001(\005\022\014\n\004h", + "ead\030\004 \001(\005\022\014\n\004rank\030\005 \001(\005\022\021\n\theadFrame\030\006 \001" + + "(\005\022\013\n\003uid\030\007 \001(\005\"\313\001\n\021AdventureBossInfo\022\017\n" + + "\007arenaId\030\001 \001(\005\022\017\n\007findUid\030\002 \001(\005\022\020\n\010findN" + + "ame\030\003 \001(\t\022\016\n\006bossId\030\004 \001(\t\022\023\n\013bossGroupId" + + "\030\005 \001(\005\022\016\n\006myHurt\030\006 \001(\005\022\021\n\tlevelTime\030\007 \001(" + + "\005\022\017\n\007totalHp\030\010 \001(\005\022\025\n\rbossRemainlHp\030\t \001(" + + "\005\022\022\n\narenaLevel\030\n \001(\005\"v\n\017UserMissionInfo" + + "\022\021\n\tmissionId\030\001 \001(\005\022\020\n\010progress\030\002 \001(\005\022\r\n" + + "\005state\030\003 \001(\005\022\014\n\004type\030\004 \001(\005\022\021\n\ttakeTimes\030" + + "\005 \001(\005\022\016\n\006heroId\030\006 \003(\t\"8\n\013VipBaseInfo\022\020\n\010", + "vipLevel\030\001 \001(\005\022\027\n\017hadTakeLevelBox\030\002 \001(\005\"" + + "\250\001\n\006Friend\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\n\n\002" + + "lv\030\003 \001(\005\022\023\n\013offLineTime\030\004 \001(\004\022\022\n\nhaveRew" + + "ard\030\005 \001(\005\022\016\n\006isGive\030\006 \001(\005\022\021\n\tisApplyed\030\007" + + " \001(\005\022\014\n\004head\030\014 \001(\005\022\r\n\005frame\030\r \001(\005\022\017\n\007sou" + + "lVal\030\016 \001(\005\"o\n\rGiftGoodsInfo\022\017\n\007goodsId\030\001" + + " \001(\005\022\020\n\010buyTimes\030\002 \001(\005\022\021\n\tstartTime\030\003 \001(" + + "\005\022\017\n\007endTime\030\004 \001(\005\022\027\n\017dynamicBuyTimes\030\005 " + + "\001(\005\"7\n\021GoodsTypeDuration\022\021\n\tgoodsType\030\001 " + + "\001(\005\022\017\n\007endTime\030\002 \001(\005\"/\n\016TechnologyInfo\022\016", + "\n\006techId\030\001 \001(\005\022\r\n\005levle\030\002 \001(\005\"J\n\020Suddenl" + + "yBossInfo\022\022\n\nsuddBossId\030\006 \001(\005\022\017\n\007endTime" + + "\030\007 \001(\005\022\021\n\tfindMapId\030\010 \001(\005\"H\n\010ItemInfo\022\022\n" + + "\ntemplateId\030\001 \001(\005\022\017\n\007overlap\030\002 \001(\005\022\027\n\017ne" + + "xtRefreshTime\030\003 \001(\005\"H\n\010RankInfo\022\014\n\004rank\030" + + "\001 \001(\005\022\016\n\006param1\030\002 \001(\005\022\016\n\006param2\030\003 \001(\005\022\016\n" + + "\006param3\030\004 \001(\005\"\306\001\n\010UserRank\022\013\n\003uid\030\001 \001(\005\022" + + "\r\n\005level\030\002 \001(\005\022\014\n\004head\030\003 \001(\005\022\020\n\010userName" + + "\030\004 \001(\t\0226\n\010rankInfo\030\005 \001(\0132$.com.ljsd.jiel" + + "ing.protocols.RankInfo\022\021\n\theadFrame\030\006 \001(", + "\005\022\021\n\tguildName\030\007 \001(\t\022\r\n\005force\030\010 \001(\005\022\021\n\tg" + + "uildSign\030\t \001(\005\"\204\001\n\025ActorEffectBufferInfo" + + "\022\n\n\002id\030\001 \001(\005\022\014\n\004type\030\002 \001(\005\022\021\n\tstartTime\030" + + "\003 \001(\005\022\017\n\007endTime\030\004 \001(\005\022\016\n\006target\030\005 \001(\005\022\016" + + "\n\006caster\030\006 \001(\005\022\r\n\005value\030\007 \003(\005\"T\n\016BloodyH" + + "eroInfo\022\016\n\006heroId\030\001 \001(\t\022\016\n\006heroHp\030\002 \001(\005\022" + + "\021\n\theroMaxHp\030\003 \001(\005\022\017\n\007heroTid\030\004 \001(\005\"%\n\010S" + + "ceneMsg\022\014\n\004time\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\"\'\n\nPo" + + "sMineral\022\013\n\003pos\030\001 \001(\005\022\014\n\004nums\030\002 \001(\005\"\264\001\n\010" + + "Creature\022\014\n\004path\030\001 \003(\005\022\r\n\005speed\030\002 \001(\005\022\r\n", + "\005maxHp\030\003 \001(\005\022\r\n\005curHp\030\004 \001(\005\022\017\n\007mineral\030\005" + + " \001(\005\022\014\n\004camp\030\006 \001(\005\022<\n\010heroInfo\030\007 \003(\0132*.c" + + "om.ljsd.jieling.protocols.BloodyHeroInfo" + + "\022\020\n\010killNums\030\010 \001(\005\"\217\001\n\nSceneActor\022\n\n\002id\030" + + "\001 \001(\005\022\016\n\006curPos\030\002 \001(\005\022\r\n\005state\030\003 \001(\005\022\014\n\004" + + "type\030\004 \001(\005\0226\n\010Creature\030\006 \001(\0132$.com.ljsd." + + "jieling.protocols.Creature\022\020\n\010userName\030\007" + + " \001(\t\"\236\002\n\tSceneInfo\022\016\n\006roomId\030\001 \001(\005\022\r\n\005ma" + + "pId\030\002 \001(\005\022:\n\nSceneActor\030\003 \003(\0132&.com.ljsd" + + ".jieling.protocols.SceneActor\022P\n\025actorEf", + "fectBufferInfo\030\004 \003(\01321.com.ljsd.jieling." + + "protocols.ActorEffectBufferInfo\022\024\n\014barri" + + "erPoint\030\005 \003(\005\022:\n\nposMineral\030\006 \003(\0132&.com." + + "ljsd.jieling.protocols.PosMineral\022\022\n\nrem" + + "ainTime\030\007 \001(\005\"S\n\027SceneGetFullMsgResponse" + + "\0228\n\tsceneInfo\030\001 \001(\0132%.com.ljsd.jieling.p" + + "rotocols.SceneInfo\"B\n\013blessReward\022\022\n\nloc" + + "ationId\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\022\020\n\010rewardId" + + "\030\003 \001(\005\"5\n\022fiveResetTowerInfo\022\r\n\005tower\030\001 " + + "\001(\005\022\020\n\010intoType\030\002 \001(\005\";\n\020FamilyContribut", + "e\022\013\n\003win\030\001 \001(\005\022\014\n\004draw\030\002 \001(\005\022\014\n\004fail\030\003 \001" + + "(\005\"\210\002\n\016FamilyBaseInfo\022\n\n\002id\030\001 \001(\005\022\014\n\004nam" + + "e\030\002 \001(\t\022\017\n\007annouce\030\003 \001(\t\022\r\n\005levle\030\004 \001(\005\022" + + "\013\n\003exp\030\005 \001(\005\022\020\n\010totalNum\030\006 \001(\005\022\016\n\006maxNum" + + "\030\007 \001(\005\022\020\n\010joinType\030\010 \001(\005\022\014\n\004icon\030\t \001(\005\022\021" + + "\n\tlevelTime\030\n \001(\005\022A\n\013fightResult\030\013 \001(\0132," + + ".com.ljsd.jieling.protocols.FamilyContri" + + "bute\022\027\n\017playerIntoLevel\030\014 \001(\005\")\n\013endless" + + "Hero\022\016\n\006heroId\030\001 \001(\t\022\n\n\002hp\030\002 \001(\005\"2\n\022Endl" + + "essRefreshInfo\022\016\n\006cellId\030\001 \001(\005\022\014\n\004time\030\002", + " \001(\005\"u\n\014UseForceInfo\022\014\n\004name\030\001 \001(\t\022\014\n\004le" + + "ve\030\002 \001(\005\022\r\n\005force\030\003 \001(\005\022\014\n\004rank\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\"H\n\013endlessSign\022\r\n\005mapId\030\001 \001(\005\022\016\n\006cel" + + "lId\030\002 \001(\005\022\014\n\004info\030\003 \001(\t\022\014\n\004type\030\004 \001(\005\"g\n" + + "\nExpertInfo\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\")\n\nSignInInfo\022\014\n\004" + + "days\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\"N\n\016TeamSimpleI" + + "nfo\022\016\n\006heroid\030\001 \001(\t\022\017\n\007heroTid\030\002 \001(\005\022\014\n\004", + "star\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\"\207\001\n\017TeamOneTea" + + "mInfo\0228\n\004team\030\001 \003(\0132*.com.ljsd.jieling.p" + + "rotocols.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\005leve" + + "l\030\002 \001(\005\022\014\n\004name\030\003 \001(\t\022\014\n\004head\030\004 \001(\005\022\021\n\th" + + "eadFrame\030\005 \001(\005\022\021\n\tguildName\030\007 \001(\t\0229\n\004tea" + + "m\030\006 \001(\0132+.com.ljsd.jieling.protocols.Tea" + + "mOneTeamInfo\022\021\n\tisApplyed\030\010 \001(\005\"y\n\017Monst" + + "erRankInfo\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\rHe" + + "roBloodInfo\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\n" + + "worldLevel\030\002 \001(\005\022\022\n\nbloodScore\030\003 \001(\005\"2\n\017" + + "PlayerBindPhone\022\020\n\010phoneNum\030\001 \001(\t\022\r\n\005sta" + + "te\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\010maxScore\030\002 \001(\005\"U\n\017Que" + + "stionOptions\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\017BloodPersonInfo\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\010serverId\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\026LuckWheelReward" + + "PosInfo\022\013\n\003pos\030\001 \001(\005\022\016\n\006luckId\030\002 \001(\005\022\021\n\t" + + "luckTimes\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.p" + + "rotocols.UserMissionInfo\022\023\n\013refreshTime\030" + + "\003 \001(\005\"\221\001\n\021MainLevelRankInfo\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\004rank\030\006 \001(\005\022\022\n\nto" + + "talForce\030\007 \001(\005\022\021\n\theadFrame\030\010 \001(\005\"B\n\017Cha" + + "mpionBetInfo\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\022ChampionBattle" + + "Info\0227\n\006myInfo\030\001 \001(\0132\'.com.ljsd.jieling." + + "protocols.TeamOneInfo\022:\n\tenemyInfo\030\002 \001(\013" + + "2\'.com.ljsd.jieling.protocols.TeamOneInf" + + "o\022\016\n\006result\030\003 \001(\005\0228\n\tfightData\030\004 \001(\0132%.c" + + "om.ljsd.jieling.protocols.FightData\"\367\001\n\026", + "ChampionBattlePairInfo\022;\n\nattackInfo\030\001 \001" + "(\0132\'.com.ljsd.jieling.protocols.TeamOneI" + - "nfo\022:\n\tenemyInfo\030\002 \001(\0132\'.com.ljsd.jielin" + - "g.protocols.TeamOneInfo\022\016\n\006result\030\003 \001(\005\022" + - "8\n\tfightData\030\004 \001(\0132%.com.ljsd.jieling.pr" + - "otocols.FightData\"\367\001\n\026ChampionBattlePair", - "Info\022;\n\nattackInfo\030\001 \001(\0132\'.com.ljsd.jiel" + - "ing.protocols.TeamOneInfo\0228\n\007defInfo\030\002 \001" + - "(\0132\'.com.ljsd.jieling.protocols.TeamOneI" + - "nfo\022\023\n\013fightResult\030\003 \001(\005\022\n\n\002id\030\004 \001(\t\022\022\n\n" + - "roundTImes\030\005 \001(\005\022\016\n\006teamId\030\006 \001(\005\022\020\n\010posi" + - "tion\030\007 \001(\005\022\017\n\007isGUess\030\010 \001(\005\"q\n\nRedPackag" + - "e\022\020\n\010userName\030\001 \001(\t\022\r\n\005redId\030\002 \001(\005\022\r\n\005is" + - "Get\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\005cou" + - "nt\030\006 \001(\005\022\016\n\006itemId\030\007 \001(\005\022\020\n\010position\030\010 \001" + - "(\005\"Z\n\030ExpeditionSimpleBossInfo\022\017\n\007heroTi" + - "d\030\001 \001(\005\022\014\n\004star\030\002 \001(\005\022\r\n\005level\030\003 \001(\005\022\020\n\010" + - "remainHp\030\004 \001(\001\"\202\001\n\022ExpeditionTeamInfo\022B\n" + - "\004hero\030\001 \003(\01324.com.ljsd.jieling.protocols" + - ".ExpeditionSimpleBossInfo\022\024\n\014PokemonInfo" + - "s\030\002 \003(\005\022\022\n\ntotalForce\030\003 \001(\005\"\251\001\n\022Expediti" + - "onNodeInfo\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\014bossTeaminfo\030\004 \001(\0132..co", - "m.ljsd.jieling.protocols.ExpeditionTeamI" + - "nfo\022\r\n\005state\030\005 \001(\005\022\023\n\013holyEquipID\030\006 \003(\005\"" + - "<\n\030ExpeditionSimpleHeroInfo\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\rMonthC" + - "ardInfo\022\n\n\002id\030\001 \001(\005\022\022\n\nendingTime\030\002 \001(\005\022" + - "\r\n\005state\030\003 \001(\005\022\020\n\010totleAmt\030\004 \001(\005B\002H\001" + "nfo\0228\n\007defInfo\030\002 \001(\0132\'.com.ljsd.jieling." + + "protocols.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\006te" + + "amId\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\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\030ExpeditionSimple" + + "BossInfo\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\010remainHp\030\004 \001(\001\"\202\001\n\022Exp" + + "editionTeamInfo\022B\n\004hero\030\001 \003(\01324.com.ljsd" + + ".jieling.protocols.ExpeditionSimpleBossI" + + "nfo\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\014bossT", + "eaminfo\030\004 \001(\0132..com.ljsd.jieling.protoco" + + "ls.ExpeditionTeamInfo\022\r\n\005state\030\005 \001(\005\022\023\n\013" + + "holyEquipID\030\006 \003(\005\"<\n\030ExpeditionSimpleHer" + + "oInfo\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\010equipt" + + "Id\030\002 \001(\005\"P\n\rMonthCardInfo\022\n\n\002id\030\001 \001(\005\022\022\n" + + "\nendingTime\030\002 \001(\005\022\r\n\005state\030\003 \001(\005\022\020\n\010totl" + + "eAmt\030\004 \001(\005B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -89874,7 +89988,7 @@ public final class CommonProto { internal_static_com_ljsd_jieling_protocols_FightUnitInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_FightUnitInfo_descriptor, - new java.lang.String[] { "UnitId", "UnitSkillIds", "Property", }); + new java.lang.String[] { "UnitId", "UnitSkillIds", "Property", "Position", }); internal_static_com_ljsd_jieling_protocols_FightTeamInfo_descriptor = getDescriptor().getMessageTypes().get(9); internal_static_com_ljsd_jieling_protocols_FightTeamInfo_fieldAccessorTable = new diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/HeroInfoProto.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/HeroInfoProto.java index 474eef05e..d6af4c973 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/HeroInfoProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/HeroInfoProto.java @@ -11704,6 +11704,573 @@ public final class HeroInfoProto { // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.MergeSoulRequest) } + public interface MergeSoulResponseOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional .com.ljsd.jieling.protocols.Drop drop = 1; + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+     *合成物
+     * 
+ */ + boolean hasDrop(); + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+     *合成物
+     * 
+ */ + com.ljsd.jieling.protocols.CommonProto.Drop getDrop(); + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+     *合成物
+     * 
+ */ + com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getDropOrBuilder(); + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.MergeSoulResponse} + */ + public static final class MergeSoulResponse extends + com.google.protobuf.GeneratedMessage + implements MergeSoulResponseOrBuilder { + // Use MergeSoulResponse.newBuilder() to construct. + private MergeSoulResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private MergeSoulResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final MergeSoulResponse defaultInstance; + public static MergeSoulResponse getDefaultInstance() { + return defaultInstance; + } + + public MergeSoulResponse getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private MergeSoulResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.ljsd.jieling.protocols.CommonProto.Drop.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = drop_.toBuilder(); + } + drop_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.Drop.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(drop_); + drop_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_MergeSoulResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_MergeSoulResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse.class, com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public MergeSoulResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new MergeSoulResponse(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional .com.ljsd.jieling.protocols.Drop drop = 1; + public static final int DROP_FIELD_NUMBER = 1; + private com.ljsd.jieling.protocols.CommonProto.Drop drop_; + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+     *合成物
+     * 
+ */ + public boolean hasDrop() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+     *合成物
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Drop getDrop() { + return drop_; + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+     *合成物
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getDropOrBuilder() { + return drop_; + } + + private void initFields() { + drop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeMessage(1, drop_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, drop_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.MergeSoulResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_MergeSoulResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_MergeSoulResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse.class, com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse.Builder.class); + } + + // Construct using com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getDropFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + if (dropBuilder_ == null) { + drop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); + } else { + dropBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_MergeSoulResponse_descriptor; + } + + public com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse.getDefaultInstance(); + } + + public com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse build() { + com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse buildPartial() { + com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse result = new com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + if (dropBuilder_ == null) { + result.drop_ = drop_; + } else { + result.drop_ = dropBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse) { + return mergeFrom((com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse other) { + if (other == com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse.getDefaultInstance()) return this; + if (other.hasDrop()) { + mergeDrop(other.getDrop()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.ljsd.jieling.protocols.HeroInfoProto.MergeSoulResponse) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional .com.ljsd.jieling.protocols.Drop drop = 1; + private com.ljsd.jieling.protocols.CommonProto.Drop drop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Drop, com.ljsd.jieling.protocols.CommonProto.Drop.Builder, com.ljsd.jieling.protocols.CommonProto.DropOrBuilder> dropBuilder_; + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+       *合成物
+       * 
+ */ + public boolean hasDrop() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+       *合成物
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Drop getDrop() { + if (dropBuilder_ == null) { + return drop_; + } else { + return dropBuilder_.getMessage(); + } + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+       *合成物
+       * 
+ */ + public Builder setDrop(com.ljsd.jieling.protocols.CommonProto.Drop value) { + if (dropBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + drop_ = value; + onChanged(); + } else { + dropBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+       *合成物
+       * 
+ */ + public Builder setDrop( + com.ljsd.jieling.protocols.CommonProto.Drop.Builder builderForValue) { + if (dropBuilder_ == null) { + drop_ = builderForValue.build(); + onChanged(); + } else { + dropBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+       *合成物
+       * 
+ */ + public Builder mergeDrop(com.ljsd.jieling.protocols.CommonProto.Drop value) { + if (dropBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + drop_ != com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance()) { + drop_ = + com.ljsd.jieling.protocols.CommonProto.Drop.newBuilder(drop_).mergeFrom(value).buildPartial(); + } else { + drop_ = value; + } + onChanged(); + } else { + dropBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+       *合成物
+       * 
+ */ + public Builder clearDrop() { + if (dropBuilder_ == null) { + drop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); + onChanged(); + } else { + dropBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+       *合成物
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Drop.Builder getDropBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getDropFieldBuilder().getBuilder(); + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+       *合成物
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getDropOrBuilder() { + if (dropBuilder_ != null) { + return dropBuilder_.getMessageOrBuilder(); + } else { + return drop_; + } + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 1; + * + *
+       *合成物
+       * 
+ */ + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Drop, com.ljsd.jieling.protocols.CommonProto.Drop.Builder, com.ljsd.jieling.protocols.CommonProto.DropOrBuilder> + getDropFieldBuilder() { + if (dropBuilder_ == null) { + dropBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Drop, com.ljsd.jieling.protocols.CommonProto.Drop.Builder, com.ljsd.jieling.protocols.CommonProto.DropOrBuilder>( + drop_, + getParentForChildren(), + isClean()); + drop_ = null; + } + return dropBuilder_; + } + + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.MergeSoulResponse) + } + + static { + defaultInstance = new MergeSoulResponse(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.MergeSoulResponse) + } + public interface OptHeroSoulOrBuilder extends com.google.protobuf.MessageOrBuilder { @@ -24589,6 +25156,1480 @@ public final class HeroInfoProto { // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.HeroLockChangeRequest) } + public interface ComplexEquipRequestOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional int32 type = 1; + /** + * optional int32 type = 1; + * + *
+     *装备类型
+     * 
+ */ + boolean hasType(); + /** + * optional int32 type = 1; + * + *
+     *装备类型
+     * 
+ */ + int getType(); + + // optional int32 star = 2; + /** + * optional int32 star = 2; + * + *
+     *装备星级 0一键合成
+     * 
+ */ + boolean hasStar(); + /** + * optional int32 star = 2; + * + *
+     *装备星级 0一键合成
+     * 
+ */ + int getStar(); + + // optional int32 num = 3; + /** + * optional int32 num = 3; + * + *
+     *合成数量
+     * 
+ */ + boolean hasNum(); + /** + * optional int32 num = 3; + * + *
+     *合成数量
+     * 
+ */ + int getNum(); + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ComplexEquipRequest} + */ + public static final class ComplexEquipRequest extends + com.google.protobuf.GeneratedMessage + implements ComplexEquipRequestOrBuilder { + // Use ComplexEquipRequest.newBuilder() to construct. + private ComplexEquipRequest(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private ComplexEquipRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final ComplexEquipRequest defaultInstance; + public static ComplexEquipRequest getDefaultInstance() { + return defaultInstance; + } + + public ComplexEquipRequest getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ComplexEquipRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + type_ = input.readInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + star_ = input.readInt32(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + num_ = input.readInt32(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_ComplexEquipRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_ComplexEquipRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest.class, com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public ComplexEquipRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ComplexEquipRequest(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional int32 type = 1; + public static final int TYPE_FIELD_NUMBER = 1; + private int type_; + /** + * optional int32 type = 1; + * + *
+     *装备类型
+     * 
+ */ + public boolean hasType() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 type = 1; + * + *
+     *装备类型
+     * 
+ */ + public int getType() { + return type_; + } + + // optional int32 star = 2; + public static final int STAR_FIELD_NUMBER = 2; + private int star_; + /** + * optional int32 star = 2; + * + *
+     *装备星级 0一键合成
+     * 
+ */ + public boolean hasStar() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 star = 2; + * + *
+     *装备星级 0一键合成
+     * 
+ */ + public int getStar() { + return star_; + } + + // optional int32 num = 3; + public static final int NUM_FIELD_NUMBER = 3; + private int num_; + /** + * optional int32 num = 3; + * + *
+     *合成数量
+     * 
+ */ + public boolean hasNum() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 num = 3; + * + *
+     *合成数量
+     * 
+ */ + public int getNum() { + return num_; + } + + private void initFields() { + type_ = 0; + star_ = 0; + num_ = 0; + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeInt32(1, type_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(2, star_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeInt32(3, num_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, type_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, star_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, num_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ComplexEquipRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_ComplexEquipRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_ComplexEquipRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest.class, com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest.Builder.class); + } + + // Construct using com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + type_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + star_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + num_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_ComplexEquipRequest_descriptor; + } + + public com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest.getDefaultInstance(); + } + + public com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest build() { + com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest buildPartial() { + com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest result = new com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.type_ = type_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.star_ = star_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.num_ = num_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest) { + return mergeFrom((com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest other) { + if (other == com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest.getDefaultInstance()) return this; + if (other.hasType()) { + setType(other.getType()); + } + if (other.hasStar()) { + setStar(other.getStar()); + } + if (other.hasNum()) { + setNum(other.getNum()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipRequest) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional int32 type = 1; + private int type_ ; + /** + * optional int32 type = 1; + * + *
+       *装备类型
+       * 
+ */ + public boolean hasType() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 type = 1; + * + *
+       *装备类型
+       * 
+ */ + public int getType() { + return type_; + } + /** + * optional int32 type = 1; + * + *
+       *装备类型
+       * 
+ */ + public Builder setType(int value) { + bitField0_ |= 0x00000001; + type_ = value; + onChanged(); + return this; + } + /** + * optional int32 type = 1; + * + *
+       *装备类型
+       * 
+ */ + public Builder clearType() { + bitField0_ = (bitField0_ & ~0x00000001); + type_ = 0; + onChanged(); + return this; + } + + // optional int32 star = 2; + private int star_ ; + /** + * optional int32 star = 2; + * + *
+       *装备星级 0一键合成
+       * 
+ */ + public boolean hasStar() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 star = 2; + * + *
+       *装备星级 0一键合成
+       * 
+ */ + public int getStar() { + return star_; + } + /** + * optional int32 star = 2; + * + *
+       *装备星级 0一键合成
+       * 
+ */ + public Builder setStar(int value) { + bitField0_ |= 0x00000002; + star_ = value; + onChanged(); + return this; + } + /** + * optional int32 star = 2; + * + *
+       *装备星级 0一键合成
+       * 
+ */ + public Builder clearStar() { + bitField0_ = (bitField0_ & ~0x00000002); + star_ = 0; + onChanged(); + return this; + } + + // optional int32 num = 3; + private int num_ ; + /** + * optional int32 num = 3; + * + *
+       *合成数量
+       * 
+ */ + public boolean hasNum() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 num = 3; + * + *
+       *合成数量
+       * 
+ */ + public int getNum() { + return num_; + } + /** + * optional int32 num = 3; + * + *
+       *合成数量
+       * 
+ */ + public Builder setNum(int value) { + bitField0_ |= 0x00000004; + num_ = value; + onChanged(); + return this; + } + /** + * optional int32 num = 3; + * + *
+       *合成数量
+       * 
+ */ + public Builder clearNum() { + bitField0_ = (bitField0_ & ~0x00000004); + num_ = 0; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ComplexEquipRequest) + } + + static { + defaultInstance = new ComplexEquipRequest(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ComplexEquipRequest) + } + + public interface ComplexEquipResponseOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // repeated string equipIds = 1; + /** + * repeated string equipIds = 1; + * + *
+     *消耗的装备
+     * 
+ */ + java.util.List + getEquipIdsList(); + /** + * repeated string equipIds = 1; + * + *
+     *消耗的装备
+     * 
+ */ + int getEquipIdsCount(); + /** + * repeated string equipIds = 1; + * + *
+     *消耗的装备
+     * 
+ */ + java.lang.String getEquipIds(int index); + /** + * repeated string equipIds = 1; + * + *
+     *消耗的装备
+     * 
+ */ + com.google.protobuf.ByteString + getEquipIdsBytes(int index); + + // optional .com.ljsd.jieling.protocols.Drop drop = 2; + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+     *合成的装备
+     * 
+ */ + boolean hasDrop(); + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+     *合成的装备
+     * 
+ */ + com.ljsd.jieling.protocols.CommonProto.Drop getDrop(); + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+     *合成的装备
+     * 
+ */ + com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getDropOrBuilder(); + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ComplexEquipResponse} + */ + public static final class ComplexEquipResponse extends + com.google.protobuf.GeneratedMessage + implements ComplexEquipResponseOrBuilder { + // Use ComplexEquipResponse.newBuilder() to construct. + private ComplexEquipResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private ComplexEquipResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final ComplexEquipResponse defaultInstance; + public static ComplexEquipResponse getDefaultInstance() { + return defaultInstance; + } + + public ComplexEquipResponse getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ComplexEquipResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + equipIds_ = new com.google.protobuf.LazyStringArrayList(); + mutable_bitField0_ |= 0x00000001; + } + equipIds_.add(input.readBytes()); + break; + } + case 18: { + com.ljsd.jieling.protocols.CommonProto.Drop.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = drop_.toBuilder(); + } + drop_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.Drop.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(drop_); + drop_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + equipIds_ = new com.google.protobuf.UnmodifiableLazyStringList(equipIds_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_ComplexEquipResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_ComplexEquipResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse.class, com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public ComplexEquipResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ComplexEquipResponse(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // repeated string equipIds = 1; + public static final int EQUIPIDS_FIELD_NUMBER = 1; + private com.google.protobuf.LazyStringList equipIds_; + /** + * repeated string equipIds = 1; + * + *
+     *消耗的装备
+     * 
+ */ + public java.util.List + getEquipIdsList() { + return equipIds_; + } + /** + * repeated string equipIds = 1; + * + *
+     *消耗的装备
+     * 
+ */ + public int getEquipIdsCount() { + return equipIds_.size(); + } + /** + * repeated string equipIds = 1; + * + *
+     *消耗的装备
+     * 
+ */ + public java.lang.String getEquipIds(int index) { + return equipIds_.get(index); + } + /** + * repeated string equipIds = 1; + * + *
+     *消耗的装备
+     * 
+ */ + public com.google.protobuf.ByteString + getEquipIdsBytes(int index) { + return equipIds_.getByteString(index); + } + + // optional .com.ljsd.jieling.protocols.Drop drop = 2; + public static final int DROP_FIELD_NUMBER = 2; + private com.ljsd.jieling.protocols.CommonProto.Drop drop_; + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+     *合成的装备
+     * 
+ */ + public boolean hasDrop() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+     *合成的装备
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Drop getDrop() { + return drop_; + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+     *合成的装备
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getDropOrBuilder() { + return drop_; + } + + private void initFields() { + equipIds_ = com.google.protobuf.LazyStringArrayList.EMPTY; + drop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + for (int i = 0; i < equipIds_.size(); i++) { + output.writeBytes(1, equipIds_.getByteString(i)); + } + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeMessage(2, drop_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + { + int dataSize = 0; + for (int i = 0; i < equipIds_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeBytesSizeNoTag(equipIds_.getByteString(i)); + } + size += dataSize; + size += 1 * getEquipIdsList().size(); + } + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, drop_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ComplexEquipResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_ComplexEquipResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_ComplexEquipResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse.class, com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse.Builder.class); + } + + // Construct using com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getDropFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + equipIds_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000001); + if (dropBuilder_ == null) { + drop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); + } else { + dropBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.ljsd.jieling.protocols.HeroInfoProto.internal_static_com_ljsd_jieling_protocols_ComplexEquipResponse_descriptor; + } + + public com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse.getDefaultInstance(); + } + + public com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse build() { + com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse buildPartial() { + com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse result = new com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + equipIds_ = new com.google.protobuf.UnmodifiableLazyStringList( + equipIds_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.equipIds_ = equipIds_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000001; + } + if (dropBuilder_ == null) { + result.drop_ = drop_; + } else { + result.drop_ = dropBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse) { + return mergeFrom((com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse other) { + if (other == com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse.getDefaultInstance()) return this; + if (!other.equipIds_.isEmpty()) { + if (equipIds_.isEmpty()) { + equipIds_ = other.equipIds_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureEquipIdsIsMutable(); + equipIds_.addAll(other.equipIds_); + } + onChanged(); + } + if (other.hasDrop()) { + mergeDrop(other.getDrop()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.ljsd.jieling.protocols.HeroInfoProto.ComplexEquipResponse) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // repeated string equipIds = 1; + private com.google.protobuf.LazyStringList equipIds_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private void ensureEquipIdsIsMutable() { + if (!((bitField0_ & 0x00000001) == 0x00000001)) { + equipIds_ = new com.google.protobuf.LazyStringArrayList(equipIds_); + bitField0_ |= 0x00000001; + } + } + /** + * repeated string equipIds = 1; + * + *
+       *消耗的装备
+       * 
+ */ + public java.util.List + getEquipIdsList() { + return java.util.Collections.unmodifiableList(equipIds_); + } + /** + * repeated string equipIds = 1; + * + *
+       *消耗的装备
+       * 
+ */ + public int getEquipIdsCount() { + return equipIds_.size(); + } + /** + * repeated string equipIds = 1; + * + *
+       *消耗的装备
+       * 
+ */ + public java.lang.String getEquipIds(int index) { + return equipIds_.get(index); + } + /** + * repeated string equipIds = 1; + * + *
+       *消耗的装备
+       * 
+ */ + public com.google.protobuf.ByteString + getEquipIdsBytes(int index) { + return equipIds_.getByteString(index); + } + /** + * repeated string equipIds = 1; + * + *
+       *消耗的装备
+       * 
+ */ + public Builder setEquipIds( + int index, java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureEquipIdsIsMutable(); + equipIds_.set(index, value); + onChanged(); + return this; + } + /** + * repeated string equipIds = 1; + * + *
+       *消耗的装备
+       * 
+ */ + public Builder addEquipIds( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureEquipIdsIsMutable(); + equipIds_.add(value); + onChanged(); + return this; + } + /** + * repeated string equipIds = 1; + * + *
+       *消耗的装备
+       * 
+ */ + public Builder addAllEquipIds( + java.lang.Iterable values) { + ensureEquipIdsIsMutable(); + super.addAll(values, equipIds_); + onChanged(); + return this; + } + /** + * repeated string equipIds = 1; + * + *
+       *消耗的装备
+       * 
+ */ + public Builder clearEquipIds() { + equipIds_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + /** + * repeated string equipIds = 1; + * + *
+       *消耗的装备
+       * 
+ */ + public Builder addEquipIdsBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + ensureEquipIdsIsMutable(); + equipIds_.add(value); + onChanged(); + return this; + } + + // optional .com.ljsd.jieling.protocols.Drop drop = 2; + private com.ljsd.jieling.protocols.CommonProto.Drop drop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Drop, com.ljsd.jieling.protocols.CommonProto.Drop.Builder, com.ljsd.jieling.protocols.CommonProto.DropOrBuilder> dropBuilder_; + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+       *合成的装备
+       * 
+ */ + public boolean hasDrop() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+       *合成的装备
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Drop getDrop() { + if (dropBuilder_ == null) { + return drop_; + } else { + return dropBuilder_.getMessage(); + } + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+       *合成的装备
+       * 
+ */ + public Builder setDrop(com.ljsd.jieling.protocols.CommonProto.Drop value) { + if (dropBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + drop_ = value; + onChanged(); + } else { + dropBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+       *合成的装备
+       * 
+ */ + public Builder setDrop( + com.ljsd.jieling.protocols.CommonProto.Drop.Builder builderForValue) { + if (dropBuilder_ == null) { + drop_ = builderForValue.build(); + onChanged(); + } else { + dropBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+       *合成的装备
+       * 
+ */ + public Builder mergeDrop(com.ljsd.jieling.protocols.CommonProto.Drop value) { + if (dropBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002) && + drop_ != com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance()) { + drop_ = + com.ljsd.jieling.protocols.CommonProto.Drop.newBuilder(drop_).mergeFrom(value).buildPartial(); + } else { + drop_ = value; + } + onChanged(); + } else { + dropBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+       *合成的装备
+       * 
+ */ + public Builder clearDrop() { + if (dropBuilder_ == null) { + drop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); + onChanged(); + } else { + dropBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+       *合成的装备
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Drop.Builder getDropBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getDropFieldBuilder().getBuilder(); + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+       *合成的装备
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getDropOrBuilder() { + if (dropBuilder_ != null) { + return dropBuilder_.getMessageOrBuilder(); + } else { + return drop_; + } + } + /** + * optional .com.ljsd.jieling.protocols.Drop drop = 2; + * + *
+       *合成的装备
+       * 
+ */ + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Drop, com.ljsd.jieling.protocols.CommonProto.Drop.Builder, com.ljsd.jieling.protocols.CommonProto.DropOrBuilder> + getDropFieldBuilder() { + if (dropBuilder_ == null) { + dropBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Drop, com.ljsd.jieling.protocols.CommonProto.Drop.Builder, com.ljsd.jieling.protocols.CommonProto.DropOrBuilder>( + drop_, + getParentForChildren(), + isClean()); + drop_ = null; + } + return dropBuilder_; + } + + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ComplexEquipResponse) + } + + static { + defaultInstance = new ComplexEquipResponse(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ComplexEquipResponse) + } + private static com.google.protobuf.Descriptors.Descriptor internal_static_com_ljsd_jieling_protocols_GetHeroListInfoRequest_descriptor; private static @@ -24674,6 +26715,11 @@ public final class HeroInfoProto { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_com_ljsd_jieling_protocols_MergeSoulRequest_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_com_ljsd_jieling_protocols_MergeSoulResponse_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_com_ljsd_jieling_protocols_MergeSoulResponse_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor internal_static_com_ljsd_jieling_protocols_OptHeroSoul_descriptor; private static @@ -24779,6 +26825,16 @@ public final class HeroInfoProto { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_com_ljsd_jieling_protocols_HeroLockChangeRequest_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_com_ljsd_jieling_protocols_ComplexEquipRequest_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_com_ljsd_jieling_protocols_ComplexEquipRequest_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_com_ljsd_jieling_protocols_ComplexEquipResponse_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_com_ljsd_jieling_protocols_ComplexEquipResponse_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -24819,45 +26875,51 @@ public final class HeroInfoProto { "st\022\016\n\006heroId\030\001 \001(\t\022\017\n\007equipId\030\002 \003(\t\022\014\n\004t" + "ype\030\003 \001(\005\"1\n\014SoulEquipPos\022\017\n\007equipId\030\001 \001", "(\005\022\020\n\010position\030\002 \001(\005\"4\n\020MergeSoulRequest" + - "\022\020\n\010targetId\030\001 \001(\005\022\016\n\006soulId\030\002 \003(\005\"]\n\013Op" + - "tHeroSoul\022\016\n\006heroId\030\001 \001(\t\022>\n\014soulEquipId" + - "s\030\002 \003(\0132(.com.ljsd.jieling.protocols.Sou" + - "lEquipPos\"\216\001\n\024SoulEquipWearRequest\0229\n\010we" + - "arInfo\030\001 \001(\0132\'.com.ljsd.jieling.protocol" + - "s.OptHeroSoul\022;\n\nunloadInfo\030\002 \001(\0132\'.com." + - "ljsd.jieling.protocols.OptHeroSoul\"l\n\032So" + - "ulEquipUnLoadWearRequest\022\016\n\006heroId\030\001 \001(\t" + - "\022>\n\014soulEquipIds\030\002 \003(\0132(.com.ljsd.jielin", - "g.protocols.SoulEquipPos\"G\n\025EquipUnLoadO" + - "ptRequest\022\016\n\006heroId\030\001 \001(\t\022\020\n\010equipIds\030\002 " + - "\003(\t\022\014\n\004type\030\003 \001(\005\"D\n\022HeroComposeRequest\022" + - ".\n\004item\030\001 \001(\0132 .com.ljsd.jieling.protoco" + - "ls.Item\"E\n\023HeroComposeResponse\022.\n\004drop\030\001" + - " \001(\0132 .com.ljsd.jieling.protocols.Drop\"1" + - "\n\022GetAllEquipRequest\022\r\n\005index\030\001 \001(\005\022\014\n\004t" + - "ype\030\002 \001(\005\"]\n\023GetAllEquipResponse\0220\n\005equi" + - "p\030\001 \003(\0132!.com.ljsd.jieling.protocols.Equ" + - "ip\022\024\n\014isSendFinish\030\002 \001(\010\"U\n\025GetAllPokemo", - "nResponse\022<\n\013pokemonInfo\030\001 \003(\0132\'.com.ljs" + - "d.jieling.protocols.PokemonInfo\"@\n\026Poken" + - "monUpLevelRequest\022\021\n\tpokemonId\030\001 \001(\005\022\023\n\013" + - "comonpentId\030\002 \001(\005\"+\n\026PokemonAdvancedRequ" + - "est\022\021\n\tpokemonId\030\001 \001(\005\"=\n\023RingFireLoadRe" + - "quest\022\021\n\tpokemonId\030\001 \001(\005\022\023\n\013comonpentId\030" + - "\002 \001(\005\"*\n\025RingFirAdvanceRequest\022\021\n\tpokemo" + - "nId\030\001 \001(\005\"X\n\026GetAllRingFireResponse\022>\n\014r" + - "ingFireInfo\030\001 \003(\0132(.com.ljsd.jieling.pro" + - "tocols.RingFireInfo\"\037\n\017SoulRandRequest\022\014", - "\n\004time\030\001 \001(\005\"]\n\020SoulRandResponse\022.\n\004drop" + - "\030\001 \001(\0132 .com.ljsd.jieling.protocols.Drop" + - "\022\013\n\003pos\030\002 \001(\005\022\014\n\004time\030\003 \001(\005\"\026\n\024SoulForce" + - "RandRequest\"T\n\025SoulForceRandResponse\022.\n\004" + - "drop\030\001 \001(\0132 .com.ljsd.jieling.protocols." + - "Drop\022\013\n\003pos\030\002 \001(\005\"#\n\021HeroReturnRequest\022\016" + - "\n\006heroId\030\001 \001(\t\"D\n\022HeroReturnResponse\022.\n\004" + - "drop\030\001 \001(\0132 .com.ljsd.jieling.protocols." + - "Drop\":\n\025HeroLockChangeRequest\022\016\n\006heroId\030" + - "\001 \001(\t\022\021\n\tlockState\030\002 \001(\005B\002H\001" + "\022\020\n\010targetId\030\001 \001(\005\022\016\n\006soulId\030\002 \003(\005\"C\n\021Me" + + "rgeSoulResponse\022.\n\004drop\030\001 \001(\0132 .com.ljsd" + + ".jieling.protocols.Drop\"]\n\013OptHeroSoul\022\016" + + "\n\006heroId\030\001 \001(\t\022>\n\014soulEquipIds\030\002 \003(\0132(.c" + + "om.ljsd.jieling.protocols.SoulEquipPos\"\216" + + "\001\n\024SoulEquipWearRequest\0229\n\010wearInfo\030\001 \001(" + + "\0132\'.com.ljsd.jieling.protocols.OptHeroSo" + + "ul\022;\n\nunloadInfo\030\002 \001(\0132\'.com.ljsd.jielin" + + "g.protocols.OptHeroSoul\"l\n\032SoulEquipUnLo", + "adWearRequest\022\016\n\006heroId\030\001 \001(\t\022>\n\014soulEqu" + + "ipIds\030\002 \003(\0132(.com.ljsd.jieling.protocols" + + ".SoulEquipPos\"G\n\025EquipUnLoadOptRequest\022\016" + + "\n\006heroId\030\001 \001(\t\022\020\n\010equipIds\030\002 \003(\t\022\014\n\004type" + + "\030\003 \001(\005\"D\n\022HeroComposeRequest\022.\n\004item\030\001 \001" + + "(\0132 .com.ljsd.jieling.protocols.Item\"E\n\023" + + "HeroComposeResponse\022.\n\004drop\030\001 \001(\0132 .com." + + "ljsd.jieling.protocols.Drop\"1\n\022GetAllEqu" + + "ipRequest\022\r\n\005index\030\001 \001(\005\022\014\n\004type\030\002 \001(\005\"]" + + "\n\023GetAllEquipResponse\0220\n\005equip\030\001 \003(\0132!.c", + "om.ljsd.jieling.protocols.Equip\022\024\n\014isSen" + + "dFinish\030\002 \001(\010\"U\n\025GetAllPokemonResponse\022<" + + "\n\013pokemonInfo\030\001 \003(\0132\'.com.ljsd.jieling.p" + + "rotocols.PokemonInfo\"@\n\026PokenmonUpLevelR" + + "equest\022\021\n\tpokemonId\030\001 \001(\005\022\023\n\013comonpentId" + + "\030\002 \001(\005\"+\n\026PokemonAdvancedRequest\022\021\n\tpoke" + + "monId\030\001 \001(\005\"=\n\023RingFireLoadRequest\022\021\n\tpo" + + "kemonId\030\001 \001(\005\022\023\n\013comonpentId\030\002 \001(\005\"*\n\025Ri" + + "ngFirAdvanceRequest\022\021\n\tpokemonId\030\001 \001(\005\"X" + + "\n\026GetAllRingFireResponse\022>\n\014ringFireInfo", + "\030\001 \003(\0132(.com.ljsd.jieling.protocols.Ring" + + "FireInfo\"\037\n\017SoulRandRequest\022\014\n\004time\030\001 \001(" + + "\005\"]\n\020SoulRandResponse\022.\n\004drop\030\001 \001(\0132 .co" + + "m.ljsd.jieling.protocols.Drop\022\013\n\003pos\030\002 \001" + + "(\005\022\014\n\004time\030\003 \001(\005\"\026\n\024SoulForceRandRequest" + + "\"T\n\025SoulForceRandResponse\022.\n\004drop\030\001 \001(\0132" + + " .com.ljsd.jieling.protocols.Drop\022\013\n\003pos" + + "\030\002 \001(\005\"#\n\021HeroReturnRequest\022\016\n\006heroId\030\001 " + + "\001(\t\"D\n\022HeroReturnResponse\022.\n\004drop\030\001 \001(\0132" + + " .com.ljsd.jieling.protocols.Drop\":\n\025Her", + "oLockChangeRequest\022\016\n\006heroId\030\001 \001(\t\022\021\n\tlo" + + "ckState\030\002 \001(\005\">\n\023ComplexEquipRequest\022\014\n\004" + + "type\030\001 \001(\005\022\014\n\004star\030\002 \001(\005\022\013\n\003num\030\003 \001(\005\"X\n" + + "\024ComplexEquipResponse\022\020\n\010equipIds\030\001 \003(\t\022" + + ".\n\004drop\030\002 \001(\0132 .com.ljsd.jieling.protoco" + + "ls.DropB\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -24966,132 +27028,150 @@ public final class HeroInfoProto { com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_MergeSoulRequest_descriptor, new java.lang.String[] { "TargetId", "SoulId", }); - internal_static_com_ljsd_jieling_protocols_OptHeroSoul_descriptor = + internal_static_com_ljsd_jieling_protocols_MergeSoulResponse_descriptor = getDescriptor().getMessageTypes().get(17); + internal_static_com_ljsd_jieling_protocols_MergeSoulResponse_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_com_ljsd_jieling_protocols_MergeSoulResponse_descriptor, + new java.lang.String[] { "Drop", }); + internal_static_com_ljsd_jieling_protocols_OptHeroSoul_descriptor = + getDescriptor().getMessageTypes().get(18); internal_static_com_ljsd_jieling_protocols_OptHeroSoul_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_OptHeroSoul_descriptor, new java.lang.String[] { "HeroId", "SoulEquipIds", }); internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_descriptor = - getDescriptor().getMessageTypes().get(18); + getDescriptor().getMessageTypes().get(19); internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SoulEquipWearRequest_descriptor, new java.lang.String[] { "WearInfo", "UnloadInfo", }); internal_static_com_ljsd_jieling_protocols_SoulEquipUnLoadWearRequest_descriptor = - getDescriptor().getMessageTypes().get(19); + getDescriptor().getMessageTypes().get(20); internal_static_com_ljsd_jieling_protocols_SoulEquipUnLoadWearRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SoulEquipUnLoadWearRequest_descriptor, new java.lang.String[] { "HeroId", "SoulEquipIds", }); internal_static_com_ljsd_jieling_protocols_EquipUnLoadOptRequest_descriptor = - getDescriptor().getMessageTypes().get(20); + getDescriptor().getMessageTypes().get(21); internal_static_com_ljsd_jieling_protocols_EquipUnLoadOptRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_EquipUnLoadOptRequest_descriptor, new java.lang.String[] { "HeroId", "EquipIds", "Type", }); internal_static_com_ljsd_jieling_protocols_HeroComposeRequest_descriptor = - getDescriptor().getMessageTypes().get(21); + getDescriptor().getMessageTypes().get(22); internal_static_com_ljsd_jieling_protocols_HeroComposeRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_HeroComposeRequest_descriptor, new java.lang.String[] { "Item", }); internal_static_com_ljsd_jieling_protocols_HeroComposeResponse_descriptor = - getDescriptor().getMessageTypes().get(22); + getDescriptor().getMessageTypes().get(23); internal_static_com_ljsd_jieling_protocols_HeroComposeResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_HeroComposeResponse_descriptor, new java.lang.String[] { "Drop", }); internal_static_com_ljsd_jieling_protocols_GetAllEquipRequest_descriptor = - getDescriptor().getMessageTypes().get(23); + getDescriptor().getMessageTypes().get(24); internal_static_com_ljsd_jieling_protocols_GetAllEquipRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_GetAllEquipRequest_descriptor, new java.lang.String[] { "Index", "Type", }); internal_static_com_ljsd_jieling_protocols_GetAllEquipResponse_descriptor = - getDescriptor().getMessageTypes().get(24); + getDescriptor().getMessageTypes().get(25); internal_static_com_ljsd_jieling_protocols_GetAllEquipResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_GetAllEquipResponse_descriptor, new java.lang.String[] { "Equip", "IsSendFinish", }); internal_static_com_ljsd_jieling_protocols_GetAllPokemonResponse_descriptor = - getDescriptor().getMessageTypes().get(25); + getDescriptor().getMessageTypes().get(26); internal_static_com_ljsd_jieling_protocols_GetAllPokemonResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_GetAllPokemonResponse_descriptor, new java.lang.String[] { "PokemonInfo", }); internal_static_com_ljsd_jieling_protocols_PokenmonUpLevelRequest_descriptor = - getDescriptor().getMessageTypes().get(26); + getDescriptor().getMessageTypes().get(27); internal_static_com_ljsd_jieling_protocols_PokenmonUpLevelRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_PokenmonUpLevelRequest_descriptor, new java.lang.String[] { "PokemonId", "ComonpentId", }); internal_static_com_ljsd_jieling_protocols_PokemonAdvancedRequest_descriptor = - getDescriptor().getMessageTypes().get(27); + getDescriptor().getMessageTypes().get(28); internal_static_com_ljsd_jieling_protocols_PokemonAdvancedRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_PokemonAdvancedRequest_descriptor, new java.lang.String[] { "PokemonId", }); internal_static_com_ljsd_jieling_protocols_RingFireLoadRequest_descriptor = - getDescriptor().getMessageTypes().get(28); + getDescriptor().getMessageTypes().get(29); internal_static_com_ljsd_jieling_protocols_RingFireLoadRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_RingFireLoadRequest_descriptor, new java.lang.String[] { "PokemonId", "ComonpentId", }); internal_static_com_ljsd_jieling_protocols_RingFirAdvanceRequest_descriptor = - getDescriptor().getMessageTypes().get(29); + getDescriptor().getMessageTypes().get(30); internal_static_com_ljsd_jieling_protocols_RingFirAdvanceRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_RingFirAdvanceRequest_descriptor, new java.lang.String[] { "PokemonId", }); internal_static_com_ljsd_jieling_protocols_GetAllRingFireResponse_descriptor = - getDescriptor().getMessageTypes().get(30); + getDescriptor().getMessageTypes().get(31); internal_static_com_ljsd_jieling_protocols_GetAllRingFireResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_GetAllRingFireResponse_descriptor, new java.lang.String[] { "RingFireInfo", }); internal_static_com_ljsd_jieling_protocols_SoulRandRequest_descriptor = - getDescriptor().getMessageTypes().get(31); + getDescriptor().getMessageTypes().get(32); internal_static_com_ljsd_jieling_protocols_SoulRandRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SoulRandRequest_descriptor, new java.lang.String[] { "Time", }); internal_static_com_ljsd_jieling_protocols_SoulRandResponse_descriptor = - getDescriptor().getMessageTypes().get(32); + getDescriptor().getMessageTypes().get(33); internal_static_com_ljsd_jieling_protocols_SoulRandResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SoulRandResponse_descriptor, new java.lang.String[] { "Drop", "Pos", "Time", }); internal_static_com_ljsd_jieling_protocols_SoulForceRandRequest_descriptor = - getDescriptor().getMessageTypes().get(33); + getDescriptor().getMessageTypes().get(34); internal_static_com_ljsd_jieling_protocols_SoulForceRandRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SoulForceRandRequest_descriptor, new java.lang.String[] { }); internal_static_com_ljsd_jieling_protocols_SoulForceRandResponse_descriptor = - getDescriptor().getMessageTypes().get(34); + getDescriptor().getMessageTypes().get(35); internal_static_com_ljsd_jieling_protocols_SoulForceRandResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SoulForceRandResponse_descriptor, new java.lang.String[] { "Drop", "Pos", }); internal_static_com_ljsd_jieling_protocols_HeroReturnRequest_descriptor = - getDescriptor().getMessageTypes().get(35); + getDescriptor().getMessageTypes().get(36); internal_static_com_ljsd_jieling_protocols_HeroReturnRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_HeroReturnRequest_descriptor, new java.lang.String[] { "HeroId", }); internal_static_com_ljsd_jieling_protocols_HeroReturnResponse_descriptor = - getDescriptor().getMessageTypes().get(36); + getDescriptor().getMessageTypes().get(37); internal_static_com_ljsd_jieling_protocols_HeroReturnResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_HeroReturnResponse_descriptor, new java.lang.String[] { "Drop", }); internal_static_com_ljsd_jieling_protocols_HeroLockChangeRequest_descriptor = - getDescriptor().getMessageTypes().get(37); + getDescriptor().getMessageTypes().get(38); internal_static_com_ljsd_jieling_protocols_HeroLockChangeRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_HeroLockChangeRequest_descriptor, new java.lang.String[] { "HeroId", "LockState", }); + internal_static_com_ljsd_jieling_protocols_ComplexEquipRequest_descriptor = + getDescriptor().getMessageTypes().get(39); + internal_static_com_ljsd_jieling_protocols_ComplexEquipRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_com_ljsd_jieling_protocols_ComplexEquipRequest_descriptor, + new java.lang.String[] { "Type", "Star", "Num", }); + internal_static_com_ljsd_jieling_protocols_ComplexEquipResponse_descriptor = + getDescriptor().getMessageTypes().get(40); + internal_static_com_ljsd_jieling_protocols_ComplexEquipResponse_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_com_ljsd_jieling_protocols_ComplexEquipResponse_descriptor, + new java.lang.String[] { "EquipIds", "Drop", }); return null; } }; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/MapStaticConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/MapStaticConfig.java index 2cf60604e..72503d400 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/MapStaticConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/MapStaticConfig.java @@ -25,7 +25,7 @@ public class MapStaticConfig extends AbstractClassStaticConfig { - private Map monsterMap; + private Map monsterMap; @Override public void registConfigs(Set registConfigs) { @@ -37,7 +37,7 @@ public class MapStaticConfig extends AbstractClassStaticConfig { public void figureConfigs() { try { - Map monsterMapVo = new ConcurrentHashMap<>(); + Map monsterMapVo = new ConcurrentHashMap<>(); for (Map.Entry entry : STableManager.getConfig(SMonsterConfig.class).entrySet()){ SMonsterConfig sMonsterConfig = entry.getValue(); if (!monsterMapVo.containsKey(sMonsterConfig.getId())){ @@ -58,7 +58,7 @@ public class MapStaticConfig extends AbstractClassStaticConfig { } - public Map getMonsterMap() { + public Map getMonsterMap() { return monsterMap; } 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 7ffc8c964..99a5232ab 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -197,7 +197,7 @@ public class CBean2Proto { .build(); } - public static CommonProto.FightUnitInfo getMonster(SMonsterConfig sMonsterConfig, int curHp) { + public static CommonProto.FightUnitInfo.Builder getMonster(SMonsterConfig sMonsterConfig, int curHp) { StringBuilder monsterPropertyList = new StringBuilder(); StringBuilder monsterSkillList = new StringBuilder(); //火风水地光暗 float[] damageReduceFactor = sMonsterConfig.getElementDamageReduceFactor(); @@ -250,7 +250,7 @@ public class CBean2Proto { monsterBuilder.setProperty(monsterPropertyList.toString()); monsterBuilder.setUnitSkillIds(monsterSkillList.toString()); monsterBuilder.setUnitId(String.valueOf(sMonsterConfig.getId())); - return monsterBuilder.build(); + return monsterBuilder; } public static CommonProto.FoodBuffer getFoodBuffer(int buffId, int leftStep) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java index a790f56d6..4cbbeb042 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -80,7 +80,7 @@ public class FightDataUtil { unitData.set("professionId", sMonster.getProfession()); unitData.set("camp", 1); unitData.set("type", sMonster.getType()); - unitData.set("position", i+1); + unitData.set("position",unitInfo.getPosition()); unitData.set("quality", sMonster.getQuality()); unitData.set("element",sMonster.getPropertyName()); if (unitSkill.length==1){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java index c2377a0cf..bf54e9b32 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java @@ -30,12 +30,16 @@ public class MonsterUtil { return map; } int[][] groupIds = sMonsterGroup.getContents(); - Map monsterMap = STableManager.getFigureConfig(MapStaticConfig.class).getMonsterMap(); + Map monsterMap = STableManager.getFigureConfig(MapStaticConfig.class).getMonsterMap(); for (int i = 0; i < groupIds.length; i++) { int[] monsterIds = groupIds[i]; List monsterList = new CopyOnWriteArrayList<>(); + int position = 1; for (int monsterId : monsterIds) { - monsterList.add(monsterMap.get(monsterId)); + if(monsterId!=0){ + monsterList.add(monsterMap.get(monsterId).setPosition(position++).build()); + } + } map.put(i,monsterList); } @@ -46,20 +50,27 @@ public class MonsterUtil { SMonsterGroup sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(groupId); int[][] groupIds = sMonsterGroup.getContents(); Map> map = new ConcurrentHashMap<>(); - Map monsterMap =STableManager.getFigureConfig(MapStaticConfig.class).getMonsterMap(); + Map monsterMap =STableManager.getFigureConfig(MapStaticConfig.class).getMonsterMap(); for (int i = 0; i < groupIds.length; i++) { int[] monsterIds = groupIds[i]; List monsterList = new ArrayList<>(); List hpInfo = hps.get(i); if(hpInfo!=null && !hpInfo.isEmpty()){ int index=0; + int position=1; for (int monsterId : monsterIds) { - SMonsterConfig sMonsterConfig = STableManager.getConfig(SMonsterConfig.class).get(monsterId); - monsterList.add(CBean2Proto.getMonster(sMonsterConfig,hpInfo.get(index))); + if(monsterId!=0){ + SMonsterConfig sMonsterConfig = STableManager.getConfig(SMonsterConfig.class).get(monsterId); + monsterList.add( CBean2Proto.getMonster(sMonsterConfig, hpInfo.get(index++)).setPosition(position++).build()); + } + } }else{ + int position=1; for (int monsterId : monsterIds) { - monsterList.add(monsterMap.get(monsterId)); + if(monsterId!=0){ + monsterList.add(monsterMap.get(monsterId).setPosition(position++).build()); + } } } map.put(i,monsterList); @@ -113,15 +124,6 @@ public class MonsterUtil { } return (int)(maxForce*(0.8+groupIds.length*0.2)); } - public static String getMonsterSkillById(int monsterId){ - CommonProto.FightUnitInfo monster = STableManager.getFigureConfig(MapStaticConfig.class).getMonsterMap().get(monsterId); - return monster.getUnitSkillIds(); - } - - public static String getMonsterPropertyById(int monsterId){ - CommonProto.FightUnitInfo monster = STableManager.getFigureConfig(MapStaticConfig.class).getMonsterMap().get(monsterId); - return monster.getProperty(); - } public static String getMonsterTeamSkillByGroup(int groupId) { if (SMonsterGroup.getsMonsterGroupMap().get(groupId).getSkill()!=null){