diff --git a/gamecommon/src/main/java/com/ljsd/jieling/protocols/CommonProto.java b/gamecommon/src/main/java/com/ljsd/jieling/protocols/CommonProto.java
index f7aaea4..5c55b9d 100644
--- a/gamecommon/src/main/java/com/ljsd/jieling/protocols/CommonProto.java
+++ b/gamecommon/src/main/java/com/ljsd/jieling/protocols/CommonProto.java
@@ -13697,6 +13697,32 @@ public final class CommonProto {
*
*/
int getWarWaySlot3();
+
+ // repeated int32 giftEquipIds = 28;
+ /**
+ * repeated int32 giftEquipIds = 28;
+ *
+ *
+ *礼物装备列表 + *+ */ + java.util.List
repeated int32 giftEquipIds = 28;
+ *
+ * + *礼物装备列表 + *+ */ + int getGiftEquipIdsCount(); + /** + *
repeated int32 giftEquipIds = 28;
+ *
+ * + *礼物装备列表 + *+ */ + int getGiftEquipIds(int index); } /** * Protobuf type {@code com.ljsd.jieling.protocols.Hero} @@ -13919,6 +13945,27 @@ public final class CommonProto { warWaySlot3_ = input.readInt32(); break; } + case 224: { + if (!((mutable_bitField0_ & 0x04000000) == 0x04000000)) { + giftEquipIds_ = new java.util.ArrayList
repeated int32 giftEquipIds = 28;
+ *
+ * + *礼物装备列表 + *+ */ + public java.util.List
repeated int32 giftEquipIds = 28;
+ *
+ * + *礼物装备列表 + *+ */ + public int getGiftEquipIdsCount() { + return giftEquipIds_.size(); + } + /** + *
repeated int32 giftEquipIds = 28;
+ *
+ * + *礼物装备列表 + *+ */ + public int getGiftEquipIds(int index) { + return giftEquipIds_.get(index); + } + private void initFields() { id_ = ""; heroId_ = 0; @@ -14825,6 +14910,7 @@ public final class CommonProto { totemId_ = 0; plan_ = java.util.Collections.emptyList(); warWaySlot3_ = 0; + giftEquipIds_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -14916,6 +15002,9 @@ public final class CommonProto { if (((bitField0_ & 0x00010000) == 0x00010000)) { output.writeInt32(27, warWaySlot3_); } + for (int i = 0; i < giftEquipIds_.size(); i++) { + output.writeInt32(28, giftEquipIds_.get(i)); + } getUnknownFields().writeTo(output); } @@ -15039,6 +15128,15 @@ public final class CommonProto { size += com.google.protobuf.CodedOutputStream .computeInt32Size(27, warWaySlot3_); } + { + int dataSize = 0; + for (int i = 0; i < giftEquipIds_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(giftEquipIds_.get(i)); + } + size += dataSize; + size += 2 * getGiftEquipIdsList().size(); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -15242,6 +15340,8 @@ public final class CommonProto { } warWaySlot3_ = 0; bitField0_ = (bitField0_ & ~0x02000000); + giftEquipIds_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x04000000); return this; } @@ -15412,6 +15512,11 @@ public final class CommonProto { to_bitField0_ |= 0x00010000; } result.warWaySlot3_ = warWaySlot3_; + if (((bitField0_ & 0x04000000) == 0x04000000)) { + giftEquipIds_ = java.util.Collections.unmodifiableList(giftEquipIds_); + bitField0_ = (bitField0_ & ~0x04000000); + } + result.giftEquipIds_ = giftEquipIds_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -15683,6 +15788,16 @@ public final class CommonProto { if (other.hasWarWaySlot3()) { setWarWaySlot3(other.getWarWaySlot3()); } + if (!other.giftEquipIds_.isEmpty()) { + if (giftEquipIds_.isEmpty()) { + giftEquipIds_ = other.giftEquipIds_; + bitField0_ = (bitField0_ & ~0x04000000); + } else { + ensureGiftEquipIdsIsMutable(); + giftEquipIds_.addAll(other.giftEquipIds_); + } + onChanged(); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -18763,6 +18878,100 @@ public final class CommonProto { return this; } + // repeated int32 giftEquipIds = 28; + private java.util.List
repeated int32 giftEquipIds = 28;
+ *
+ * + *礼物装备列表 + *+ */ + public java.util.List
repeated int32 giftEquipIds = 28;
+ *
+ * + *礼物装备列表 + *+ */ + public int getGiftEquipIdsCount() { + return giftEquipIds_.size(); + } + /** + *
repeated int32 giftEquipIds = 28;
+ *
+ * + *礼物装备列表 + *+ */ + public int getGiftEquipIds(int index) { + return giftEquipIds_.get(index); + } + /** + *
repeated int32 giftEquipIds = 28;
+ *
+ * + *礼物装备列表 + *+ */ + public Builder setGiftEquipIds( + int index, int value) { + ensureGiftEquipIdsIsMutable(); + giftEquipIds_.set(index, value); + onChanged(); + return this; + } + /** + *
repeated int32 giftEquipIds = 28;
+ *
+ * + *礼物装备列表 + *+ */ + public Builder addGiftEquipIds(int value) { + ensureGiftEquipIdsIsMutable(); + giftEquipIds_.add(value); + onChanged(); + return this; + } + /** + *
repeated int32 giftEquipIds = 28;
+ *
+ * + *礼物装备列表 + *+ */ + public Builder addAllGiftEquipIds( + java.lang.Iterable extends java.lang.Integer> values) { + ensureGiftEquipIdsIsMutable(); + super.addAll(values, giftEquipIds_); + onChanged(); + return this; + } + /** + *
repeated int32 giftEquipIds = 28;
+ *
+ * + *礼物装备列表 + *+ */ + public Builder clearGiftEquipIds() { + giftEquipIds_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x04000000); + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.Hero) } @@ -143334,7 +143543,7 @@ public final class CommonProto { "Property\022\020\n\010position\030\006 \001(\005\022\025\n\rrefineAttr" + "Num\030\007 \001(\005\"2\n\014AdjustUnLock\022\020\n\010position\030\001 " + "\001(\005\022\020\n\010isUnLock\030\002 \001(\005\"3\n\016PositionSkills\022", - "\020\n\010position\030\001 \001(\005\022\017\n\007skillId\030\002 \001(\005\"\370\005\n\004H" + + "\020\n\010position\030\001 \001(\005\022\017\n\007skillId\030\002 \001(\005\"\216\006\n\004H" + "ero\022\n\n\002id\030\001 \001(\t\022\016\n\006heroId\030\002 \001(\005\022\r\n\005level" + "\030\003 \001(\005\022\017\n\007breakId\030\004 \001(\005\022\014\n\004star\030\005 \001(\005\022\016\n" + "\006skinId\030\006 \001(\005\022\023\n\013equipIdList\030\010 \003(\005\022\022\n\ncr" + @@ -143353,392 +143562,392 @@ public final class CommonProto { "\016positionSkills\030\030 \003(\0132*.com.ljsd.jieling" + ".protocols.PositionSkills\022\017\n\007totemId\030\031 \001" + "(\005\0224\n\004plan\030\032 \003(\0132&.com.ljsd.jieling.prot" + - "ocols.CombatPlan\022\023\n\013warWaySlot3\030\033 \001(\005\"\204\001", - "\n\rFightUnitInfo\022\016\n\006unitId\030\001 \001(\t\022\024\n\014unitS" + - "killIds\030\002 \001(\t\022\020\n\010property\030\003 \001(\t\022\020\n\010posit" + - "ion\030\004 \001(\005\022\014\n\004star\030\005 \001(\005\022\014\n\004camp\030\006 \001(\005\022\r\n" + - "\005round\030\007 \001(\005\"N\n\016MotherShipPlan\022\n\n\002id\030\001 \001" + - "(\t\022\r\n\005cfgId\030\002 \001(\005\022\014\n\004sort\030\003 \001(\005\022\023\n\013leade" + - "rSkill\030\004 \001(\t\"\201\001\n\016MotherShipInfo\022\n\n\002id\030\001 " + - "\001(\005\022\020\n\010property\030\002 \001(\t\0228\n\004plan\030\003 \003(\0132*.co" + - "m.ljsd.jieling.protocols.MotherShipPlan\022" + - "\027\n\017unlockSkillSize\030\004 \001(\005\"\223\003\n\rFightTeamIn" + - "fo\022@\n\rfightUnitList\030\001 \003(\0132).com.ljsd.jie", - "ling.protocols.FightUnitInfo\022\025\n\rteamSkil" + - "lList\030\002 \001(\t\022\027\n\017teamPassiveList\030\003 \001(\t\022\026\n\016" + - "specialPassive\030\004 \001(\t\022\021\n\tfirstCamp\030\005 \001(\005\022" + - "\024\n\014useSupportId\030\006 \001(\005\022\031\n\021supportSkillLev" + - "el\030\007 \001(\005\022\025\n\ruseAdjutantId\030\010 \001(\005\022\032\n\022adjut" + - "antSkillLevel\030\t \001(\005\022B\n\016motherShipInfo\030\n " + - "\001(\0132*.com.ljsd.jieling.protocols.MotherS" + - "hipInfo\022=\n\nsubstitute\030\013 \001(\0132).com.ljsd.j" + - "ieling.protocols.FightUnitInfo\"-\n\023EventB" + - "ehaviorValues\022\026\n\016behaviorValues\030\001 \003(\005\"y\n", - "\023EventBehaviorCommon\022\024\n\014behaviorType\030\001 \001" + - "(\005\022L\n\023eventBehaviorValues\030\002 \003(\0132/.com.lj" + - "sd.jieling.protocols.EventBehaviorValues" + - "\"=\n\004Cell\022\016\n\006cellId\030\001 \001(\005\022\017\n\007pointId\030\002 \001(" + - "\005\022\024\n\014monsterForce\030\003 \001(\005\"^\n\007Mission\022\016\n\006it" + - "emId\030\001 \001(\005\022\r\n\005state\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\"" + - "\316\001\n\004Mail\022\016\n\006mailId\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\010mailIt" + - "em\030\005 \001(\t\022\020\n\010sendTime\030\006 \001(\005\022\025\n\reffectiveT", - "ime\030\007 \001(\005\022\020\n\010sendName\030\010 \001(\t\022\020\n\010mailType\030" + - "\t \001(\005\022\021\n\tmailparam\030\n \003(\t\022\026\n\016mailtitlepar" + - "am\030\013 \003(\t\"\260\001\n\nCombatPlan\022\n\n\002id\030\001 \001(\t\022\024\n\014c" + - "ombatPlanId\030\002 \001(\005\0226\n\010property\030\003 \003(\0132$.co" + - "m.ljsd.jieling.protocols.Property\022\r\n\005ski" + - "ll\030\004 \003(\005\022\017\n\007quality\030\005 \001(\005\022\020\n\010isLocked\030\006 " + - "\001(\005\022\026\n\016promotionLevel\030\007 \001(\005\"\321\003\n\004Drop\0222\n\010" + - "itemlist\030\001 \003(\0132 .com.ljsd.jieling.protoc" + - "ols.Item\0222\n\007equipId\030\002 \003(\0132!.com.ljsd.jie" + - "ling.protocols.Equip\022.\n\004Hero\030\003 \003(\0132 .com", - ".ljsd.jieling.protocols.Hero\0224\n\tsoulEqui" + - "p\030\004 \003(\0132!.com.ljsd.jieling.protocols.Equ" + - "ip\0224\n\004plan\030\005 \003(\0132&.com.ljsd.jieling.prot" + - "ocols.CombatPlan\0220\n\005medal\030\006 \003(\0132!.com.lj" + - "sd.jieling.protocols.Medal\022B\n\016motherShip" + - "Plan\030\007 \003(\0132*.com.ljsd.jieling.protocols." + - "MotherShipPlan\022\r\n\005title\030\010 \003(\005\022@\n\ritemTra" + - "nsform\030\t \003(\0132).com.ljsd.jieling.protocol" + - "s.ItemTransform\"K\n\rItemTransform\022\024\n\014item" + - "IdBefore\030\001 \001(\005\022\023\n\013itemIdAfter\030\002 \001(\005\022\017\n\007i", - "temNum\030\003 \001(\003\"\034\n\tGMCommand\022\017\n\007command\030\001 \001" + - "(\t\"0\n\014TeamHeroInfo\022\020\n\010position\030\001 \001(\005\022\016\n\006" + - "heroId\030\002 \001(\t\"6\n\017TeamPokemonInfo\022\020\n\010posit" + - "ion\030\001 \001(\005\022\021\n\tpokemonId\030\002 \001(\005\"\207\002\n\013TeamPos" + - "Info\022\016\n\006teamId\030\001 \001(\005\022\020\n\010teamName\030\002 \001(\t\022?" + - "\n\rteamHeroInfos\030\003 \003(\0132(.com.ljsd.jieling" + - ".protocols.TeamHeroInfo\022E\n\020teamPokemonIn" + - "fos\030\004 \003(\0132+.com.ljsd.jieling.protocols.T" + - "eamPokemonInfo\022\023\n\013formationId\030\005 \001(\005\022\021\n\ts" + - "upportId\030\006 \001(\005\022\022\n\nadjutantId\030\007 \001(\005\022\022\n\nsu", - "bstitute\030\010 \001(\t\"-\n\020Pokemoncomonpent\022\n\n\002id" + - "\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\"p\n\013PokemonInfo\022\n\n\002" + - "id\030\001 \001(\005\022\r\n\005stage\030\002 \001(\005\022F\n\020pokemoncomonp" + - "ent\030\003 \003(\0132,.com.ljsd.jieling.protocols.P" + - "okemoncomonpent\">\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\020WorkShopBaseInfo\022\014\n\004type\030\001 \001(\005\022\r\n\005lev" + - "le\030\002 \001(\005\022\013\n\003exp\030\003 \001(\005\".\n\022WorkShopUnLockI" + - "nfo\022\014\n\004type\030\001 \001(\005\022\n\n\002id\030\004 \003(\005\"\214\002\n\tFightD" + - "ata\022A\n\016heroFightInfos\030\001 \001(\0132).com.ljsd.j", - "ieling.protocols.FightTeamInfo\022>\n\013monste" + - "rList\030\002 \003(\0132).com.ljsd.jieling.protocols" + - ".FightTeamInfo\022\021\n\tfightSeed\030\003 \001(\005\022\024\n\014fig" + - "htMaxTime\030\004 \001(\005\022\021\n\tfightType\030\005 \001(\005\022@\n\rte" + - "mporaryUnit\030\006 \003(\0132).com.ljsd.jieling.pro" + - "tocols.FightUnitInfo\"-\n\rExploreDetail\022\n\n" + - "\002id\030\001 \001(\005\022\020\n\010progress\030\002 \001(\005\"0\n\nFoodBuffe" + - "r\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\007fightId\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\006areaId\030\001" + - " \001(\005\022D\n\017LevelDifficulty\030\002 \003(\0132+.com.ljsd" + - ".jieling.protocols.LevelDifficulty\":\n\007Ma" + - "pInfo\022\r\n\005mapId\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\nactiv" + - "ityId\030\001 \002(\005\022E\n\007mission\030\002 \003(\01324.com.ljsd." + - "jieling.protocols.ActivityInfo.MissionIn" + - "fo\022\r\n\005value\030\006 \001(\005\022\021\n\tstartTime\030\005 \001(\005\022\017\n\007" + - "endTime\030\003 \001(\005\022\022\n\nreallyOpen\030\004 \001(\005\032A\n\013Mis", - "sionInfo\022\021\n\tmissionId\030\001 \002(\005\022\020\n\010progress\030" + - "\002 \002(\005\022\r\n\005state\030\003 \002(\005\"J\n\nGmResponse\022.\n\004dr" + - "op\030\001 \001(\0132 .com.ljsd.jieling.protocols.Dr" + - "op\022\014\n\004info\030\002 \001(\t\"\227\002\n\017ArenaPersonInfo\022\013\n\003" + - "uid\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\ntotalForce\030\007 \001(\005\022\021\n\theadFrame\030\010 \001(\005" + - "\022\020\n\010likeNums\030\t \001(\005\022\016\n\006heroId\030\n \001(\005\022\023\n\013fo" + - "rmationId\030\013 \001(\005\022\022\n\nservername\030\014 \001(\t\022\020\n\010s" + - "erverid\030\r \001(\005\022\030\n\020investigateLevel\030\016 \001(\005\022", - "\021\n\tguildName\030\017 \001(\t\"\027\n\004Team\022\017\n\007heroTid\030\001 " + - "\003(\005\",\n\005Title\022\n\n\002id\030\001 \001(\005\022\027\n\017insert_datat" + - "ime\030\002 \001(\003\"\326\001\n\nArenaEnemy\022?\n\npersonInfo\030\001" + - " \001(\0132+.com.ljsd.jieling.protocols.ArenaP" + - "ersonInfo\022.\n\004team\030\002 \001(\0132 .com.ljsd.jieli" + - "ng.protocols.Team\0220\n\005title\030\003 \001(\0132!.com.l" + - "jsd.jieling.protocols.Title\022\023\n\013worshipTi" + - "me\030\004 \001(\005\022\020\n\010hadProud\030\005 \001(\010\"\222\001\n\tArenaInfo" + - "\022\020\n\010failNums\030\001 \001(\005\022\023\n\013successNums\030\002 \001(\005\022" + - "\r\n\005score\030\003 \001(\005\022;\n\013arenaEnemys\030\004 \003(\0132&.co", - "m.ljsd.jieling.protocols.ArenaEnemy\022\022\n\nh" + - "adTakeBox\030\005 \003(\005\"\'\n\tStoreItem\022\n\n\002id\030\001 \001(\005" + - "\022\016\n\006buyNum\030\002 \001(\005\"\216\001\n\tStoreInfo\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.protocols.StoreIte" + - "m\"\340\001\n\017ArenaRecordInfo\022\n\n\002id\030\001 \001(\t\022?\n\natt" + - "ackInfo\030\002 \001(\0132+.com.ljsd.jieling.protoco" + - "ls.ArenaPersonInfo\022\022\n\nattackTime\030\003 \001(\005\022\025" + - "\n\rmyScoreChange\030\004 \001(\005\022\023\n\013fightResult\030\005 \001", - "(\005\022@\n\013defenseInfo\030\006 \001(\0132+.com.ljsd.jieli" + - "ng.protocols.ArenaPersonInfo\"Z\n\016Function" + - "OfTime\022\022\n\nfunctionId\030\001 \001(\005\022\021\n\tstartTime\030" + - "\002 \001(\005\022\017\n\007endTime\030\003 \001(\005\022\020\n\010interval\030\004 \001(\005" + - "\"~\n\025AdventureRankItemInfo\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\003u" + - "id\030\007 \001(\005\"\313\001\n\021AdventureBossInfo\022\017\n\007arenaI" + - "d\030\001 \001(\005\022\017\n\007findUid\030\002 \001(\005\022\020\n\010findName\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\007to" + - "talHp\030\010 \001(\003\022\025\n\rbossRemainlHp\030\t \001(\003\022\022\n\nar" + - "enaLevel\030\n \001(\005\"v\n\017UserMissionInfo\022\021\n\tmis" + - "sionId\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\"Q\n\013VipBaseInfo\022\020\n\010vipLeve" + - "l\030\001 \001(\005\022\027\n\017hadTakeLevelBox\030\002 \003(\005\022\027\n\017hadT" + - "akeDailyBox\030\003 \001(\005\"\271\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\013offLineTim" + - "e\030\004 \001(\004\022\022\n\nhaveReward\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\005" + - "frame\030\r \001(\005\022\017\n\007soulVal\030\016 \001(\005\022\017\n\007titleId\030" + - "\017 \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\007" + - "endTime\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\006tec" + - "hId\030\001 \001(\005\022\r\n\005levle\030\002 \001(\005\"J\n\020SuddenlyBoss" + - "Info\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\ntemp", - "lateId\030\001 \001(\005\022\017\n\007overlap\030\002 \001(\003\022\027\n\017nextRef" + - "reshTime\030\003 \001(\005\"H\n\010RankInfo\022\014\n\004rank\030\001 \001(\005" + - "\022\016\n\006param1\030\002 \001(\003\022\016\n\006param2\030\003 \001(\003\022\016\n\006para" + - "m3\030\004 \001(\003\"\307\002\n\010UserRank\022\013\n\003uid\030\001 \001(\005\022\r\n\005le" + - "vel\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.jieling.p" + - "rotocols.RankInfo\022\021\n\theadFrame\030\006 \001(\005\022\021\n\t" + - "guildName\030\007 \001(\t\022\r\n\005force\030\010 \001(\005\022\021\n\tguildS" + - "ign\030\t \001(\005\022\013\n\003sex\030\n \001(\005\022\017\n\007likeNum\030\013 \001(\005\022" + - "\022\n\nserverName\030\014 \001(\t\022\020\n\010serverId\030\r \001(\005\022\026\n", - "\016heroTemplateId\030\016 \001(\005\022\021\n\theroLevel\030\017 \001(\005" + - "\022\020\n\010heroStar\030\020 \001(\005\"\204\001\n\025ActorEffectBuffer" + - "Info\022\n\n\002id\030\001 \001(\005\022\014\n\004type\030\002 \001(\005\022\021\n\tstartT" + - "ime\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\016Blo" + - "odyHeroInfo\022\016\n\006heroId\030\001 \001(\t\022\016\n\006heroHp\030\002 " + - "\001(\003\022\021\n\theroMaxHp\030\003 \001(\003\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(\003\022\r\n\005curHp\030\004 \001(\003\022\017\n\007miner" + - "al\030\005 \001(\005\022\014\n\004camp\030\006 \001(\005\022<\n\010heroInfo\030\007 \003(\013" + - "2*.com.ljsd.jieling.protocols.BloodyHero" + - "Info\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\010Creature\030\006 \001(\0132$.com.l" + - "jsd.jieling.protocols.Creature\022\020\n\010userNa" + - "me\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\nSceneActor\030\003 \003(\0132&.com." + - "ljsd.jieling.protocols.SceneActor\022P\n\025act", - "orEffectBufferInfo\030\004 \003(\01321.com.ljsd.jiel" + - "ing.protocols.ActorEffectBufferInfo\022\024\n\014b" + - "arrierPoint\030\005 \003(\005\022:\n\nposMineral\030\006 \003(\0132&." + - "com.ljsd.jieling.protocols.PosMineral\022\022\n" + - "\nremainTime\030\007 \001(\005\"S\n\027SceneGetFullMsgResp" + - "onse\0228\n\tsceneInfo\030\001 \001(\0132%.com.ljsd.jieli" + - "ng.protocols.SceneInfo\"B\n\013blessReward\022\022\n" + - "\nlocationId\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\022\020\n\010rewa" + - "rdId\030\003 \001(\005\"5\n\022fiveResetTowerInfo\022\r\n\005towe" + - "r\030\001 \001(\005\022\020\n\010intoType\030\002 \001(\005\";\n\020FamilyContr", - "ibute\022\013\n\003win\030\001 \001(\005\022\014\n\004draw\030\002 \001(\005\022\014\n\004fail" + - "\030\003 \001(\005\"\226\002\n\016FamilyBaseInfo\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\010totalNum\030\006 \001(\005\022\016\n\006ma" + - "xNum\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.FamilyCo" + - "ntribute\022\027\n\017playerIntoLevel\030\014 \001(\005\022\014\n\004fet" + - "e\030\r \001(\005\")\n\013endlessHero\022\016\n\006heroId\030\001 \001(\t\022\n" + - "\n\002hp\030\002 \001(\001\"2\n\022EndlessRefreshInfo\022\016\n\006cell", - "Id\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\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\theadFra" + - "me\030\006 \001(\005\022\013\n\003uid\030\007 \001(\005\"H\n\013endlessSign\022\r\n\005" + - "mapId\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\004name\030\001 " + - "\001(\t\022\r\n\005score\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\022\r\n\005leve" + - "l\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005" + - "\")\n\nSignInInfo\022\014\n\004days\030\001 \001(\005\022\r\n\005state\030\002 " + - "\001(\005\"r\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\005level\030\004 " + - "\001(\005\022\020\n\010position\030\005 \001(\005\022\020\n\010remainHp\030\006 \001(\001\"" + - "\234\001\n\017TeamOneTeamInfo\0228\n\004team\030\001 \003(\0132*.com." + - "ljsd.jieling.protocols.TeamSimpleInfo\022\024\n" + - "\014PokemonInfos\030\002 \003(\005\022\022\n\ntotalForce\030\003 \001(\005\022" + - "\020\n\010remainHp\030\004 \003(\001\022\023\n\013formationId\030\005 \001(\005\"\346" + - "\003\n\013TeamOneInfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001" + - "(\005\022\014\n\004name\030\003 \001(\t\022\014\n\004head\030\004 \001(\005\022\021\n\theadFr" + - "ame\030\005 \001(\005\022\021\n\tguildName\030\007 \001(\t\0229\n\004team\030\006 \001" + - "(\0132+.com.ljsd.jieling.protocols.TeamOneT", - "eamInfo\022\021\n\tisApplyed\030\010 \001(\005\022\025\n\rteamFormat" + - "ion\030\t \001(\005\022B\n\016motherShipInfo\030\n \001(\0132*.com." + - "ljsd.jieling.protocols.MotherShipInfo\022\022\n" + - "\nadjutantId\030\013 \001(\005\022\025\n\radjutantlevel\030\014 \001(\005" + - "\022\030\n\020investigateLevel\030\r \001(\005\022\021\n\tsupportId\030" + - "\016 \001(\005\022\013\n\003vip\030\017 \001(\005\022\022\n\nsubstitute\030\020 \001(\t\022\017" + - "\n\007showVip\030\021 \001(\010\022\025\n\rsubstituteTid\030\022 \001(\005\022\027" + - "\n\017substituteLevel\030\023 \001(\005\022\026\n\016substituteSta" + - "r\030\024 \001(\005\"y\n\017MonsterRankInfo\022\014\n\004name\030\001 \001(\t" + - "\022\r\n\005score\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\022\r\n\005level\030\004", - " \001(\005\022\014\n\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\022\013\n" + - "\003uid\030\007 \001(\005\"2\n\rHeroBloodInfo\022\016\n\006heroId\030\001 " + - "\001(\t\022\021\n\tlostBlood\030\002 \001(\005\"D\n\013EndlessInfo\022\r\n" + - "\005mapId\030\001 \001(\005\022\022\n\nworldLevel\030\002 \001(\005\022\022\n\nbloo" + - "dScore\030\003 \001(\005\"2\n\017PlayerBindPhone\022\020\n\010phone" + - "Num\030\001 \001(\t\022\r\n\005state\030\002 \001(\005\"3\n\014EndlessPoint" + - "\022\020\n\010location\030\001 \001(\005\022\021\n\tmonsterId\030\002 \001(\005\"2\n" + - "\014StrongerInfo\022\020\n\010curScore\030\001 \001(\005\022\020\n\010maxSc" + - "ore\030\002 \001(\005\"U\n\017QuestionOptions\022\017\n\007content\030" + - "\001 \001(\t\022\014\n\004type\030\002 \001(\005\022\017\n\007options\030\003 \003(\t\022\022\n\n", - "answerType\030\004 \001(\005\"\212\001\n\017BloodPersonInfo\022\n\n\002" + - "id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\021\n\theadFrame\030\003 \001(" + - "\005\022\014\n\004head\030\004 \001(\005\022\020\n\010serverId\030\005 \001(\005\022\r\n\005lev" + - "el\030\006 \001(\005\022\014\n\004rank\030\007 \001(\005\022\r\n\005score\030\010 \001(\005\"H\n" + - "\026LuckWheelRewardPosInfo\022\013\n\003pos\030\001 \001(\005\022\016\n\006" + - "luckId\030\002 \001(\005\022\021\n\tluckTimes\030\003 \001(\005\"l\n\013Refre" + - "shTask\022\014\n\004type\030\001 \001(\005\022:\n\005tasks\030\002 \003(\0132+.co" + - "m.ljsd.jieling.protocols.UserMissionInfo" + - "\022\023\n\013refreshTime\030\003 \001(\005\"\221\001\n\021MainLevelRankI" + - "nfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\022\014\n\004name\030", - "\003 \001(\t\022\017\n\007fightId\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\014\n\004" + - "rank\030\006 \001(\005\022\022\n\ntotalForce\030\007 \001(\005\022\021\n\theadFr" + - "ame\030\010 \001(\005\"B\n\017ChampionBetInfo\022\n\n\002id\030\001 \001(\t" + - "\022\020\n\010redCoins\030\002 \001(\005\022\021\n\tblueCoins\030\003 \001(\005\"\323\001" + - "\n\022ChampionBattleInfo\0227\n\006myInfo\030\001 \001(\0132\'.c" + - "om.ljsd.jieling.protocols.TeamOneInfo\022:\n" + - "\tenemyInfo\030\002 \001(\0132\'.com.ljsd.jieling.prot" + - "ocols.TeamOneInfo\022\016\n\006result\030\003 \001(\005\0228\n\tfig" + - "htData\030\004 \001(\0132%.com.ljsd.jieling.protocol" + - "s.FightData\"\367\001\n\026ChampionBattlePairInfo\022;", - "\n\nattackInfo\030\001 \001(\0132\'.com.ljsd.jieling.pr" + - "otocols.TeamOneInfo\0228\n\007defInfo\030\002 \001(\0132\'.c" + - "om.ljsd.jieling.protocols.TeamOneInfo\022\023\n" + - "\013fightResult\030\003 \001(\005\022\n\n\002id\030\004 \001(\t\022\022\n\nroundT" + - "Imes\030\005 \001(\005\022\016\n\006teamId\030\006 \001(\005\022\020\n\010position\030\007" + - " \001(\005\022\017\n\007isGUess\030\010 \001(\005\"q\n\nRedPackage\022\020\n\010u" + - "serName\030\001 \001(\t\022\r\n\005redId\030\002 \001(\005\022\r\n\005isGet\030\003 " + - "\001(\005\022\020\n\010getCount\030\004 \001(\005\022\017\n\007redType\030\005 \001(\005\022\020" + - "\n\010sendTime\030\006 \001(\005\"\211\001\n\014RedOneDetail\022\013\n\003uid" + - "\030\001 \001(\005\022\014\n\004head\030\002 \001(\005\022\021\n\theadFrame\030\003 \001(\005\022", - "\014\n\004name\030\004 \001(\t\022\014\n\004time\030\005 \001(\005\022\r\n\005count\030\006 \001" + - "(\005\022\016\n\006itemId\030\007 \001(\005\022\020\n\010position\030\010 \001(\005\"Z\n\030" + - "ExpeditionSimpleBossInfo\022\017\n\007heroTid\030\001 \001(" + - "\005\022\014\n\004star\030\002 \001(\005\022\r\n\005level\030\003 \001(\005\022\020\n\010remain" + - "Hp\030\004 \001(\001\"\224\001\n\022ExpeditionTeamInfo\022B\n\004hero\030" + - "\001 \003(\01324.com.ljsd.jieling.protocols.Exped" + - "itionSimpleBossInfo\022\024\n\014PokemonInfos\030\002 \003(" + - "\005\022\022\n\ntotalForce\030\003 \001(\005\022\020\n\010teamInfo\030\004 \001(\005\"" + - "\251\001\n\022ExpeditionNodeInfo\022\016\n\006sortId\030\001 \001(\005\022\013" + - "\n\003lay\030\002 \001(\005\022\014\n\004type\030\003 \001(\005\022D\n\014bossTeaminf", - "o\030\004 \001(\0132..com.ljsd.jieling.protocols.Exp" + - "editionTeamInfo\022\r\n\005state\030\005 \001(\005\022\023\n\013holyEq" + - "uipID\030\006 \003(\005\"<\n\030ExpeditionSimpleHeroInfo\022" + - "\016\n\006heroId\030\001 \001(\t\022\020\n\010remainHp\030\002 \001(\001\"/\n\017Exp" + - "editionEquip\022\n\n\002id\030\001 \001(\t\022\020\n\010equiptId\030\002 \001" + - "(\005\"P\n\rMonthCardInfo\022\n\n\002id\030\001 \001(\005\022\022\n\nendin" + - "gTime\030\002 \001(\005\022\r\n\005state\030\003 \001(\005\022\020\n\010totleAmt\030\004" + - " \001(\001\"?\n\021CarGrapRecordItem\022\014\n\004time\030\001 \001(\005\022" + - "\013\n\003uid\030\002 \001(\005\022\017\n\007content\030\003 \001(\t\">\n\rGuildHe" + - "lpInfo\022\014\n\004type\030\001 \001(\005\022\013\n\003num\030\002 \001(\005\022\022\n\nhad", - "takenum\030\003 \001(\005\"x\n\014GuildHelpLog\022\021\n\thelperu" + - "id\030\001 \001(\005\022\021\n\ttargetuid\030\002 \001(\005\022\022\n\nhelpernam" + - "e\030\003 \001(\t\022\022\n\ntargetname\030\004 \001(\t\022\014\n\004type\030\005 \001(" + - "\005\022\014\n\004time\030\006 \001(\005\"\303\001\n\014ViewHeroInfo\022.\n\004hero" + - "\030\001 \001(\0132 .com.ljsd.jieling.protocols.Hero" + - "\0220\n\005equip\030\002 \003(\0132!.com.ljsd.jieling.proto" + - "cols.Equip\022B\n\016SpecialEffects\030\003 \003(\0132*.com" + - ".ljsd.jieling.protocols.SpecialEffects\022\r" + - "\n\005force\030\004 \001(\005\"3\n\021EveryHeroHandBook\022\016\n\006he" + - "roId\030\001 \001(\005\022\016\n\006status\030\002 \001(\005\"=\n\rSituationI", - "nfo\022\n\n\002id\030\001 \001(\005\022\020\n\010overTime\030\002 \001(\005\022\016\n\006pas" + - "sId\030\003 \001(\005\"\361\001\n\024FightRePlayPopupData\022\020\n\010pl" + - "ayName\030\001 \001(\t\0228\n\tfightData\030\002 \001(\0132%.com.lj" + - "sd.jieling.protocols.FightData\022\020\n\010playTi" + - "me\030\003 \001(\005\022\016\n\006headId\030\004 \001(\005\022\031\n\021curFormation" + - "Index\030\005 \001(\005\022\016\n\006dataID\030\006 \001(\005\022\021\n\theadFrame" + - "\030\007 \001(\005\022\023\n\013formationId\030\010 \001(\005\022\030\n\020investiga" + - "teLevel\030\t \001(\005\"H\n\013SupportInfo\022\021\n\tsupportI" + - "d\030\001 \001(\005\022\022\n\nopenStatus\030\002 \001(\005\022\022\n\nskillLeve" + - "l\030\003 \001(\005\"z\n\013SupportDate\022\r\n\005level\030\001 \001(\005\022\013\n", - "\003exp\030\002 \001(\005\022\n\n\002hp\030\003 \001(\005\022\013\n\003att\030\004 \001(\005\022\023\n\013r" + - "efineLevel\030\005 \001(\005\022\017\n\007soulNum\030\006 \001(\005\022\020\n\010isa" + - "ctive\030\007 \001(\010\"T\n\016ModuleProperty\022\n\n\002id\030\001 \001(" + - "\005\0226\n\010property\030\002 \003(\0132$.com.ljsd.jieling.p" + - "rotocols.Property\"\212\001\n\007General\022\n\n\002id\030\001 \001(" + - "\005\022\r\n\005level\030\002 \001(\005\022\013\n\003exp\030\003 \001(\005\022\023\n\013rankUpL" + - "evel\030\004 \001(\005\022B\n\016moduleProperty\030\005 \001(\0132*.com" + - ".ljsd.jieling.protocols.ModuleProperty\"F" + - "\n\022VirtualBattleCount\022\014\n\004type\030\001 \001(\005\022\r\n\005co" + - "unt\030\002 \001(\005\022\023\n\013hasBuyCount\030\003 \001(\005\"0\n\017Virtua", - "lStarList\022\017\n\007fightId\030\001 \001(\005\022\014\n\004star\030\002 \003(\005" + - "\"\220\001\n\020VirtualEliteBoss\022\020\n\010username\030\001 \001(\t\022" + - "\014\n\004head\030\002 \001(\005\022\017\n\007fightId\030\003 \001(\005\022\020\n\010viplev" + - "el\030\004 \001(\005\0229\n\010teamInfo\030\005 \001(\0132\'.com.ljsd.ji" + - "eling.protocols.TeamOneInfo\",\n\010TankInfo\022" + - "\016\n\006tankId\030\001 \001(\t\022\020\n\010remainHp\030\002 \001(\001\"Z\n\rFri" + - "endSupport\022\013\n\003uid\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022.\n" + - "\004tank\030\003 \001(\0132 .com.ljsd.jieling.protocols" + - ".Hero\"+\n\020WelfareRedPacket\022\n\n\002id\030\001 \001(\005\022\013\n" + - "\003num\030\002 \001(\005\"N\n\013JourneyInfo\022\r\n\005mapId\030\001 \001(\005", - "\022\017\n\007process\030\002 \001(\005\022\020\n\010redPoint\030\003 \001(\005\022\r\n\005f" + - "irst\030\004 \001(\005\"\213\001\n\022JourneyMonsterInfo\022\021\n\tmon" + - "sterId\030\001 \001(\005\022\024\n\014monsterIndex\030\002 \001(\005\022\021\n\tmo" + - "nsterHp\030\003 \001(\003\022\022\n\nremainTime\030\004 \001(\005\022\021\n\tatt" + - "ackNum\030\005 \001(\005\022\022\n\nrewardShow\030\006 \001(\005\"K\n\020Jour" + - "neyGoodsInfo\022\017\n\007goodsId\030\001 \001(\005\022\022\n\ngoodsIn" + - "dex\030\002 \001(\005\022\022\n\nremainTime\030\003 \001(\005\"S\n\013Journey" + - "Cell\022\016\n\006cellId\030\001 \001(\005\022\017\n\007pointId\030\002 \001(\005\022\021\n" + - "\tcellIndex\030\003 \001(\005\022\020\n\010rewardId\030\004 \001(\005\"K\n\021Ba" + - "ttleMissionInfo\022\021\n\tmissionId\030\001 \001(\005\022\017\n\007ta", - "kTime\030\002 \001(\005\022\022\n\nviptakTime\030\003 \001(\005\"\034\n\rRando" + - "mRequest\022\013\n\003sex\030\001 \001(\005\"d\n\026BattlePassInfoR" + - "esponse\022\r\n\005pross\030\001 \001(\005\022;\n\004info\030\002 \003(\0132-.c" + - "om.ljsd.jieling.protocols.BattleMissionI" + - "nfo\"@\n\032GetBattlePassRewardRequest\022\021\n\tmis" + - "sionId\030\001 \001(\005\022\017\n\007getType\030\002 \001(\005\"\200\001\n\033GetBat" + - "tlePassRewardResponse\022.\n\004drop\030\001 \001(\0132 .co" + - "m.ljsd.jieling.protocols.Drop\0221\n\007vipdrop" + - "\030\002 \001(\0132 .com.ljsd.jieling.protocols.Drop" + - "\"\200\001\n\013RankingInfo\022\n\n\002id\030\001 \001(\005\022\013\n\003uid\030\002 \001(", - "\005\022\r\n\005level\030\003 \001(\005\022\014\n\004name\030\004 \001(\t\022\014\n\004head\030\005" + - " \001(\005\022\014\n\004rank\030\006 \001(\005\022\021\n\theadFrame\030\007 \001(\005\022\014\n" + - "\004time\030\010 \001(\003\",\n\nHeroLuxury\022\n\n\002id\030\001 \001(\005\022\022\n" + - "\nfreeStatus\030\002 \001(\005\"X\n\016CampSimpleInfo\022\014\n\004c" + - "amp\030\001 \001(\005\022\020\n\010totalNum\030\002 \001(\005\022\022\n\ntotalFigh" + - "t\030\003 \001(\005\022\022\n\ntotalScore\030\004 \001(\005\"+\n\nFightEntr" + - "y\022\016\n\006teamId\030\001 \001(\005\022\r\n\005fight\030\002 \001(\005\"\300\001\n\016Use" + - "rSimpleInfo\022\020\n\010serverId\030\001 \001(\005\022\016\n\006userId\030" + - "\002 \001(\005\022\020\n\010headIcon\030\003 \001(\005\022\021\n\theadFrame\030\004 \001" + - "(\005\022\020\n\010nickName\030\005 \001(\t\0228\n\010fightMap\030\006 \003(\0132&", - ".com.ljsd.jieling.protocols.FightEntry\022\014" + - "\n\004camp\030\007 \001(\005\022\r\n\005level\030\010 \001(\005\"\327\001\n\021CampWarP" + - "layerInfo\022B\n\016userSimpleInfo\030\001 \001(\0132*.com." + - "ljsd.jieling.protocols.UserSimpleInfo\022\r\n" + - "\005score\030\002 \001(\005\022\023\n\013fightResult\030\003 \001(\005\022\023\n\013cha" + - "ngeScore\030\004 \001(\005\022E\n\014battleRecord\030\005 \001(\0132/.c" + - "om.ljsd.jieling.protocols.CampWarBattleR" + - "ecord\"\336\001\n\023CampWarBattleRecord\022\026\n\016battleR" + - "ecordId\030\001 \001(\t\022\022\n\ncreateTime\030\002 \001(\003\022\024\n\014att" + - "ackerUser\030\003 \001(\005\022\024\n\014defenderUser\030\004 \001(\005\022\022\n", - "\nwinnerUser\030\005 \001(\005\022\023\n\013changeScore\030\006 \001(\005\0228" + - "\n\tfightData\030\007 \001(\0132%.com.ljsd.jieling.pro" + - "tocols.FightData\022\014\n\004star\030\010 \001(\005\"\177\n\034CampWa" + - "rRankingListPlayerInfo\022B\n\016userSimpleInfo" + - "\030\001 \001(\0132*.com.ljsd.jieling.protocols.User" + - "SimpleInfo\022\r\n\005score\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\"" + - "\232\001\n\026CampWarRankingListInfo\022H\n\006top100\030\001 \003" + - "(\01328.com.ljsd.jieling.protocols.CampWarR" + - "ankingListPlayerInfo\022\021\n\tselfScore\030\002 \001(\005\022" + - "\020\n\010selfRank\030\003 \001(\005\022\021\n\tselfFight\030\004 \001(\005\"o\n\025", - "MonthCardRechargeInfo\022\023\n\013monthCardId\030\001 \001" + - "(\005\022\032\n\022realRechargeAmount\030\002 \001(\001\022%\n\035welfar" + - "eCurrencyRechargeAmount\030\003 \001(\001\"<\n\021Privile" + - "geCardInfo\022\016\n\006cardId\030\001 \001(\005\022\027\n\017takeDailyR" + - "eward\030\002 \001(\010B\002H\001" + "ocols.CombatPlan\022\023\n\013warWaySlot3\030\033 \001(\005\022\024\n", + "\014giftEquipIds\030\034 \003(\005\"\204\001\n\rFightUnitInfo\022\016\n" + + "\006unitId\030\001 \001(\t\022\024\n\014unitSkillIds\030\002 \001(\t\022\020\n\010p" + + "roperty\030\003 \001(\t\022\020\n\010position\030\004 \001(\005\022\014\n\004star\030" + + "\005 \001(\005\022\014\n\004camp\030\006 \001(\005\022\r\n\005round\030\007 \001(\005\"N\n\016Mo" + + "therShipPlan\022\n\n\002id\030\001 \001(\t\022\r\n\005cfgId\030\002 \001(\005\022" + + "\014\n\004sort\030\003 \001(\005\022\023\n\013leaderSkill\030\004 \001(\t\"\201\001\n\016M" + + "otherShipInfo\022\n\n\002id\030\001 \001(\005\022\020\n\010property\030\002 " + + "\001(\t\0228\n\004plan\030\003 \003(\0132*.com.ljsd.jieling.pro" + + "tocols.MotherShipPlan\022\027\n\017unlockSkillSize" + + "\030\004 \001(\005\"\223\003\n\rFightTeamInfo\022@\n\rfightUnitLis", + "t\030\001 \003(\0132).com.ljsd.jieling.protocols.Fig" + + "htUnitInfo\022\025\n\rteamSkillList\030\002 \001(\t\022\027\n\017tea" + + "mPassiveList\030\003 \001(\t\022\026\n\016specialPassive\030\004 \001" + + "(\t\022\021\n\tfirstCamp\030\005 \001(\005\022\024\n\014useSupportId\030\006 " + + "\001(\005\022\031\n\021supportSkillLevel\030\007 \001(\005\022\025\n\ruseAdj" + + "utantId\030\010 \001(\005\022\032\n\022adjutantSkillLevel\030\t \001(" + + "\005\022B\n\016motherShipInfo\030\n \001(\0132*.com.ljsd.jie" + + "ling.protocols.MotherShipInfo\022=\n\nsubstit" + + "ute\030\013 \001(\0132).com.ljsd.jieling.protocols.F" + + "ightUnitInfo\"-\n\023EventBehaviorValues\022\026\n\016b", + "ehaviorValues\030\001 \003(\005\"y\n\023EventBehaviorComm" + + "on\022\024\n\014behaviorType\030\001 \001(\005\022L\n\023eventBehavio" + + "rValues\030\002 \003(\0132/.com.ljsd.jieling.protoco" + + "ls.EventBehaviorValues\"=\n\004Cell\022\016\n\006cellId" + + "\030\001 \001(\005\022\017\n\007pointId\030\002 \001(\005\022\024\n\014monsterForce\030" + + "\003 \001(\005\"^\n\007Mission\022\016\n\006itemId\030\001 \001(\005\022\r\n\005stat" + + "e\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\"\316\001\n\004Mail\022\016\n\006mailId" + + "\030\001 \001(\t\022\r\n\005state\030\002 \001(\005\022\014\n\004head\030\003 \001(\t\022\017\n\007c" + + "ontent\030\004 \001(\t\022\020\n\010mailItem\030\005 \001(\t\022\020\n\010sendTi", + "me\030\006 \001(\005\022\025\n\reffectiveTime\030\007 \001(\005\022\020\n\010sendN" + + "ame\030\010 \001(\t\022\020\n\010mailType\030\t \001(\005\022\021\n\tmailparam" + + "\030\n \003(\t\022\026\n\016mailtitleparam\030\013 \003(\t\"\260\001\n\nComba" + + "tPlan\022\n\n\002id\030\001 \001(\t\022\024\n\014combatPlanId\030\002 \001(\005\022" + + "6\n\010property\030\003 \003(\0132$.com.ljsd.jieling.pro" + + "tocols.Property\022\r\n\005skill\030\004 \003(\005\022\017\n\007qualit" + + "y\030\005 \001(\005\022\020\n\010isLocked\030\006 \001(\005\022\026\n\016promotionLe" + + "vel\030\007 \001(\005\"\321\003\n\004Drop\0222\n\010itemlist\030\001 \003(\0132 .c" + + "om.ljsd.jieling.protocols.Item\0222\n\007equipI" + + "d\030\002 \003(\0132!.com.ljsd.jieling.protocols.Equ", + "ip\022.\n\004Hero\030\003 \003(\0132 .com.ljsd.jieling.prot" + + "ocols.Hero\0224\n\tsoulEquip\030\004 \003(\0132!.com.ljsd" + + ".jieling.protocols.Equip\0224\n\004plan\030\005 \003(\0132&" + + ".com.ljsd.jieling.protocols.CombatPlan\0220" + + "\n\005medal\030\006 \003(\0132!.com.ljsd.jieling.protoco" + + "ls.Medal\022B\n\016motherShipPlan\030\007 \003(\0132*.com.l" + + "jsd.jieling.protocols.MotherShipPlan\022\r\n\005" + + "title\030\010 \003(\005\022@\n\ritemTransform\030\t \003(\0132).com" + + ".ljsd.jieling.protocols.ItemTransform\"K\n" + + "\rItemTransform\022\024\n\014itemIdBefore\030\001 \001(\005\022\023\n\013", + "itemIdAfter\030\002 \001(\005\022\017\n\007itemNum\030\003 \001(\003\"\034\n\tGM" + + "Command\022\017\n\007command\030\001 \001(\t\"0\n\014TeamHeroInfo" + + "\022\020\n\010position\030\001 \001(\005\022\016\n\006heroId\030\002 \001(\t\"6\n\017Te" + + "amPokemonInfo\022\020\n\010position\030\001 \001(\005\022\021\n\tpokem" + + "onId\030\002 \001(\005\"\207\002\n\013TeamPosInfo\022\016\n\006teamId\030\001 \001" + + "(\005\022\020\n\010teamName\030\002 \001(\t\022?\n\rteamHeroInfos\030\003 " + + "\003(\0132(.com.ljsd.jieling.protocols.TeamHer" + + "oInfo\022E\n\020teamPokemonInfos\030\004 \003(\0132+.com.lj" + + "sd.jieling.protocols.TeamPokemonInfo\022\023\n\013" + + "formationId\030\005 \001(\005\022\021\n\tsupportId\030\006 \001(\005\022\022\n\n", + "adjutantId\030\007 \001(\005\022\022\n\nsubstitute\030\010 \001(\t\"-\n\020" + + "Pokemoncomonpent\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.lj" + + "sd.jieling.protocols.Pokemoncomonpent\">\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\020WorkShopBaseInf" + + "o\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\"\214\002\n\tFightData\022A\n\016heroFightIn", + "fos\030\001 \001(\0132).com.ljsd.jieling.protocols.F" + + "ightTeamInfo\022>\n\013monsterList\030\002 \003(\0132).com." + + "ljsd.jieling.protocols.FightTeamInfo\022\021\n\t" + + "fightSeed\030\003 \001(\005\022\024\n\014fightMaxTime\030\004 \001(\005\022\021\n" + + "\tfightType\030\005 \001(\005\022@\n\rtemporaryUnit\030\006 \003(\0132" + + ").com.ljsd.jieling.protocols.FightUnitIn" + + "fo\"-\n\rExploreDetail\022\n\n\002id\030\001 \001(\005\022\020\n\010progr" + + "ess\030\002 \001(\005\"0\n\nFoodBuffer\022\020\n\010bufferId\030\001 \001(" + + "\005\022\020\n\010leftStep\030\002 \001(\005\"/\n\023NewPlayerGuidePoi" + + "nt\022\014\n\004type\030\001 \001(\005\022\n\n\002id\030\002 \001(\005\"L\n\017LevelDif", + "ficulty\022\017\n\007fightId\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\024LevelDiffi" + + "cultyInfos\022\016\n\006areaId\030\001 \001(\005\022D\n\017LevelDiffi" + + "culty\030\002 \003(\0132+.com.ljsd.jieling.protocols" + + ".LevelDifficulty\":\n\007MapInfo\022\r\n\005mapId\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\007mis" + + "sion\030\002 \003(\01324.com.ljsd.jieling.protocols." + + "ActivityInfo.MissionInfo\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\nr", + "eallyOpen\030\004 \001(\005\032A\n\013MissionInfo\022\021\n\tmissio" + + "nId\030\001 \002(\005\022\020\n\010progress\030\002 \002(\005\022\r\n\005state\030\003 \002" + + "(\005\"J\n\nGmResponse\022.\n\004drop\030\001 \001(\0132 .com.ljs" + + "d.jieling.protocols.Drop\022\014\n\004info\030\002 \001(\t\"\227" + + "\002\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\004h" + + "ead\030\005 \001(\005\022\014\n\004rank\030\006 \001(\005\022\022\n\ntotalForce\030\007 " + + "\001(\005\022\021\n\theadFrame\030\010 \001(\005\022\020\n\010likeNums\030\t \001(\005" + + "\022\016\n\006heroId\030\n \001(\005\022\023\n\013formationId\030\013 \001(\005\022\022\n" + + "\nservername\030\014 \001(\t\022\020\n\010serverid\030\r \001(\005\022\030\n\020i", + "nvestigateLevel\030\016 \001(\005\022\021\n\tguildName\030\017 \001(\t" + + "\"\027\n\004Team\022\017\n\007heroTid\030\001 \003(\005\",\n\005Title\022\n\n\002id" + + "\030\001 \001(\005\022\027\n\017insert_datatime\030\002 \001(\003\"\326\001\n\nAren" + + "aEnemy\022?\n\npersonInfo\030\001 \001(\0132+.com.ljsd.ji" + + "eling.protocols.ArenaPersonInfo\022.\n\004team\030" + + "\002 \001(\0132 .com.ljsd.jieling.protocols.Team\022" + + "0\n\005title\030\003 \001(\0132!.com.ljsd.jieling.protoc" + + "ols.Title\022\023\n\013worshipTime\030\004 \001(\005\022\020\n\010hadPro" + + "ud\030\005 \001(\010\"\222\001\n\tArenaInfo\022\020\n\010failNums\030\001 \001(\005" + + "\022\023\n\013successNums\030\002 \001(\005\022\r\n\005score\030\003 \001(\005\022;\n\013", + "arenaEnemys\030\004 \003(\0132&.com.ljsd.jieling.pro" + + "tocols.ArenaEnemy\022\022\n\nhadTakeBox\030\005 \003(\005\"\'\n" + + "\tStoreItem\022\n\n\002id\030\001 \001(\005\022\016\n\006buyNum\030\002 \001(\005\"\216" + + "\001\n\tStoreInfo\022\n\n\002id\030\001 \001(\005\022\027\n\017lastRefreshT" + + "ime\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.jiel" + + "ing.protocols.StoreItem\"\340\001\n\017ArenaRecordI" + + "nfo\022\n\n\002id\030\001 \001(\t\022?\n\nattackInfo\030\002 \001(\0132+.co" + + "m.ljsd.jieling.protocols.ArenaPersonInfo" + + "\022\022\n\nattackTime\030\003 \001(\005\022\025\n\rmyScoreChange\030\004 ", + "\001(\005\022\023\n\013fightResult\030\005 \001(\005\022@\n\013defenseInfo\030" + + "\006 \001(\0132+.com.ljsd.jieling.protocols.Arena" + + "PersonInfo\"Z\n\016FunctionOfTime\022\022\n\nfunction" + + "Id\030\001 \001(\005\022\021\n\tstartTime\030\002 \001(\005\022\017\n\007endTime\030\003" + + " \001(\005\022\020\n\010interval\030\004 \001(\005\"~\n\025AdventureRankI" + + "temInfo\022\r\n\005level\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\014\n\004" + + "hurt\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\021Adven" + + "tureBossInfo\022\017\n\007arenaId\030\001 \001(\005\022\017\n\007findUid" + + "\030\002 \001(\005\022\020\n\010findName\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(\003\022\025\n\rbos" + + "sRemainlHp\030\t \001(\003\022\022\n\narenaLevel\030\n \001(\005\"v\n\017" + + "UserMissionInfo\022\021\n\tmissionId\030\001 \001(\005\022\020\n\010pr" + + "ogress\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\"Q\n\013" + + "VipBaseInfo\022\020\n\010vipLevel\030\001 \001(\005\022\027\n\017hadTake" + + "LevelBox\030\002 \003(\005\022\027\n\017hadTakeDailyBox\030\003 \001(\005\"" + + "\271\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\022\017\n\007titleId\030\017 \001(\005\"o\n\rGiftGoods" + + "Info\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\017d" + + "ynamicBuyTimes\030\005 \001(\005\"7\n\021GoodsTypeDuratio" + + "n\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\020SuddenlyBossInfo\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\007ov" + + "erlap\030\002 \001(\003\022\027\n\017nextRefreshTime\030\003 \001(\005\"H\n\010" + + "RankInfo\022\014\n\004rank\030\001 \001(\005\022\016\n\006param1\030\002 \001(\003\022\016" + + "\n\006param2\030\003 \001(\003\022\016\n\006param3\030\004 \001(\003\"\307\002\n\010UserR" + + "ank\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.jieling.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\tguildSign\030\t \001(\005\022\013\n\003sex\030\n" + + " \001(\005\022\017\n\007likeNum\030\013 \001(\005\022\022\n\nserverName\030\014 \001(", + "\t\022\020\n\010serverId\030\r \001(\005\022\026\n\016heroTemplateId\030\016 " + + "\001(\005\022\021\n\theroLevel\030\017 \001(\005\022\020\n\010heroStar\030\020 \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\007endTi" + + "me\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\016BloodyHeroInfo\022\016\n\006her" + + "oId\030\001 \001(\t\022\016\n\006heroHp\030\002 \001(\003\022\021\n\theroMaxHp\030\003" + + " \001(\003\022\017\n\007heroTid\030\004 \001(\005\"%\n\010SceneMsg\022\014\n\004tim" + + "e\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\"\'\n\nPosMineral\022\013\n\003po" + + "s\030\001 \001(\005\022\014\n\004nums\030\002 \001(\005\"\264\001\n\010Creature\022\014\n\004pa", + "th\030\001 \003(\005\022\r\n\005speed\030\002 \001(\005\022\r\n\005maxHp\030\003 \001(\003\022\r" + + "\n\005curHp\030\004 \001(\003\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.jielin" + + "g.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\006curPo" + + "s\030\002 \001(\005\022\r\n\005state\030\003 \001(\005\022\014\n\004type\030\004 \001(\005\0226\n\010" + + "Creature\030\006 \001(\0132$.com.ljsd.jieling.protoc" + + "ols.Creature\022\020\n\010userName\030\007 \001(\t\"\236\002\n\tScene" + + "Info\022\016\n\006roomId\030\001 \001(\005\022\r\n\005mapId\030\002 \001(\005\022:\n\nS" + + "ceneActor\030\003 \003(\0132&.com.ljsd.jieling.proto", + "cols.SceneActor\022P\n\025actorEffectBufferInfo" + + "\030\004 \003(\01321.com.ljsd.jieling.protocols.Acto" + + "rEffectBufferInfo\022\024\n\014barrierPoint\030\005 \003(\005\022" + + ":\n\nposMineral\030\006 \003(\0132&.com.ljsd.jieling.p" + + "rotocols.PosMineral\022\022\n\nremainTime\030\007 \001(\005\"" + + "S\n\027SceneGetFullMsgResponse\0228\n\tsceneInfo\030" + + "\001 \001(\0132%.com.ljsd.jieling.protocols.Scene" + + "Info\"B\n\013blessReward\022\022\n\nlocationId\030\001 \001(\005\022" + + "\r\n\005state\030\002 \001(\005\022\020\n\010rewardId\030\003 \001(\005\"5\n\022five" + + "ResetTowerInfo\022\r\n\005tower\030\001 \001(\005\022\020\n\010intoTyp", + "e\030\002 \001(\005\";\n\020FamilyContribute\022\013\n\003win\030\001 \001(\005" + + "\022\014\n\004draw\030\002 \001(\005\022\014\n\004fail\030\003 \001(\005\"\226\002\n\016FamilyB" + + "aseInfo\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\017\n\007ann" + + "ouce\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\010join" + + "Type\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.jiel" + + "ing.protocols.FamilyContribute\022\027\n\017player" + + "IntoLevel\030\014 \001(\005\022\014\n\004fete\030\r \001(\005\")\n\013endless" + + "Hero\022\016\n\006heroId\030\001 \001(\t\022\n\n\002hp\030\002 \001(\001\"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\"r\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\022\020\n\010position\030\005 " + + "\001(\005\022\020\n\010remainHp\030\006 \001(\001\"\234\001\n\017TeamOneTeamInf" + + "o\0228\n\004team\030\001 \003(\0132*.com.ljsd.jieling.proto" + + "cols.TeamSimpleInfo\022\024\n\014PokemonInfos\030\002 \003(" + + "\005\022\022\n\ntotalForce\030\003 \001(\005\022\020\n\010remainHp\030\004 \003(\001\022" + + "\023\n\013formationId\030\005 \001(\005\"\346\003\n\013TeamOneInfo\022\013\n\003" + + "uid\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\tguild" + + "Name\030\007 \001(\t\0229\n\004team\030\006 \001(\0132+.com.ljsd.jiel", + "ing.protocols.TeamOneTeamInfo\022\021\n\tisApply" + + "ed\030\010 \001(\005\022\025\n\rteamFormation\030\t \001(\005\022B\n\016mothe" + + "rShipInfo\030\n \001(\0132*.com.ljsd.jieling.proto" + + "cols.MotherShipInfo\022\022\n\nadjutantId\030\013 \001(\005\022" + + "\025\n\radjutantlevel\030\014 \001(\005\022\030\n\020investigateLev" + + "el\030\r \001(\005\022\021\n\tsupportId\030\016 \001(\005\022\013\n\003vip\030\017 \001(\005" + + "\022\022\n\nsubstitute\030\020 \001(\t\022\017\n\007showVip\030\021 \001(\010\022\025\n" + + "\rsubstituteTid\030\022 \001(\005\022\027\n\017substituteLevel\030" + + "\023 \001(\005\022\026\n\016substituteStar\030\024 \001(\005\"y\n\017Monster" + + "RankInfo\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\rHero" + + "BloodInfo\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\nwo" + + "rldLevel\030\002 \001(\005\022\022\n\nbloodScore\030\003 \001(\005\"2\n\017Pl" + + "ayerBindPhone\022\020\n\010phoneNum\030\001 \001(\t\022\r\n\005state" + + "\030\002 \001(\005\"3\n\014EndlessPoint\022\020\n\010location\030\001 \001(\005" + + "\022\021\n\tmonsterId\030\002 \001(\005\"2\n\014StrongerInfo\022\020\n\010c" + + "urScore\030\001 \001(\005\022\020\n\010maxScore\030\002 \001(\005\"U\n\017Quest" + + "ionOptions\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\026LuckWheelRewardPo" + + "sInfo\022\013\n\003pos\030\001 \001(\005\022\016\n\006luckId\030\002 \001(\005\022\021\n\tlu" + + "ckTimes\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.pro" + + "tocols.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\ntota" + + "lForce\030\007 \001(\005\022\021\n\theadFrame\030\010 \001(\005\"B\n\017Champ" + + "ionBetInfo\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\022ChampionBattleIn" + + "fo\0227\n\006myInfo\030\001 \001(\0132\'.com.ljsd.jieling.pr" + + "otocols.TeamOneInfo\022:\n\tenemyInfo\030\002 \001(\0132\'" + + ".com.ljsd.jieling.protocols.TeamOneInfo\022" + + "\016\n\006result\030\003 \001(\005\0228\n\tfightData\030\004 \001(\0132%.com" + + ".ljsd.jieling.protocols.FightData\"\367\001\n\026Ch", + "ampionBattlePairInfo\022;\n\nattackInfo\030\001 \001(\013" + + "2\'.com.ljsd.jieling.protocols.TeamOneInf" + + "o\0228\n\007defInfo\030\002 \001(\0132\'.com.ljsd.jieling.pr" + + "otocols.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\006team" + + "Id\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\005r" + + "edId\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\004t" + + "ime\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\030ExpeditionSimpleBo" + + "ssInfo\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\"\224\001\n\022Exped" + + "itionTeamInfo\022B\n\004hero\030\001 \003(\01324.com.ljsd.j" + + "ieling.protocols.ExpeditionSimpleBossInf" + + "o\022\024\n\014PokemonInfos\030\002 \003(\005\022\022\n\ntotalForce\030\003 " + + "\001(\005\022\020\n\010teamInfo\030\004 \001(\005\"\251\001\n\022ExpeditionNode" + + "Info\022\016\n\006sortId\030\001 \001(\005\022\013\n\003lay\030\002 \001(\005\022\014\n\004typ", + "e\030\003 \001(\005\022D\n\014bossTeaminfo\030\004 \001(\0132..com.ljsd" + + ".jieling.protocols.ExpeditionTeamInfo\022\r\n" + + "\005state\030\005 \001(\005\022\023\n\013holyEquipID\030\006 \003(\005\"<\n\030Exp" + + "editionSimpleHeroInfo\022\016\n\006heroId\030\001 \001(\t\022\020\n" + + "\010remainHp\030\002 \001(\001\"/\n\017ExpeditionEquip\022\n\n\002id" + + "\030\001 \001(\t\022\020\n\010equiptId\030\002 \001(\005\"P\n\rMonthCardInf" + + "o\022\n\n\002id\030\001 \001(\005\022\022\n\nendingTime\030\002 \001(\005\022\r\n\005sta" + + "te\030\003 \001(\005\022\020\n\010totleAmt\030\004 \001(\001\"?\n\021CarGrapRec" + + "ordItem\022\014\n\004time\030\001 \001(\005\022\013\n\003uid\030\002 \001(\005\022\017\n\007co" + + "ntent\030\003 \001(\t\">\n\rGuildHelpInfo\022\014\n\004type\030\001 \001", + "(\005\022\013\n\003num\030\002 \001(\005\022\022\n\nhadtakenum\030\003 \001(\005\"x\n\014G" + + "uildHelpLog\022\021\n\thelperuid\030\001 \001(\005\022\021\n\ttarget" + + "uid\030\002 \001(\005\022\022\n\nhelpername\030\003 \001(\t\022\022\n\ntargetn" + + "ame\030\004 \001(\t\022\014\n\004type\030\005 \001(\005\022\014\n\004time\030\006 \001(\005\"\303\001" + + "\n\014ViewHeroInfo\022.\n\004hero\030\001 \001(\0132 .com.ljsd." + + "jieling.protocols.Hero\0220\n\005equip\030\002 \003(\0132!." + + "com.ljsd.jieling.protocols.Equip\022B\n\016Spec" + + "ialEffects\030\003 \003(\0132*.com.ljsd.jieling.prot" + + "ocols.SpecialEffects\022\r\n\005force\030\004 \001(\005\"3\n\021E" + + "veryHeroHandBook\022\016\n\006heroId\030\001 \001(\005\022\016\n\006stat", + "us\030\002 \001(\005\"=\n\rSituationInfo\022\n\n\002id\030\001 \001(\005\022\020\n" + + "\010overTime\030\002 \001(\005\022\016\n\006passId\030\003 \001(\005\"\361\001\n\024Figh" + + "tRePlayPopupData\022\020\n\010playName\030\001 \001(\t\0228\n\tfi" + + "ghtData\030\002 \001(\0132%.com.ljsd.jieling.protoco" + + "ls.FightData\022\020\n\010playTime\030\003 \001(\005\022\016\n\006headId" + + "\030\004 \001(\005\022\031\n\021curFormationIndex\030\005 \001(\005\022\016\n\006dat" + + "aID\030\006 \001(\005\022\021\n\theadFrame\030\007 \001(\005\022\023\n\013formatio" + + "nId\030\010 \001(\005\022\030\n\020investigateLevel\030\t \001(\005\"H\n\013S" + + "upportInfo\022\021\n\tsupportId\030\001 \001(\005\022\022\n\nopenSta" + + "tus\030\002 \001(\005\022\022\n\nskillLevel\030\003 \001(\005\"z\n\013Support", + "Date\022\r\n\005level\030\001 \001(\005\022\013\n\003exp\030\002 \001(\005\022\n\n\002hp\030\003" + + " \001(\005\022\013\n\003att\030\004 \001(\005\022\023\n\013refineLevel\030\005 \001(\005\022\017" + + "\n\007soulNum\030\006 \001(\005\022\020\n\010isactive\030\007 \001(\010\"T\n\016Mod" + + "uleProperty\022\n\n\002id\030\001 \001(\005\0226\n\010property\030\002 \003(" + + "\0132$.com.ljsd.jieling.protocols.Property\"" + + "\212\001\n\007General\022\n\n\002id\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\022\013" + + "\n\003exp\030\003 \001(\005\022\023\n\013rankUpLevel\030\004 \001(\005\022B\n\016modu" + + "leProperty\030\005 \001(\0132*.com.ljsd.jieling.prot" + + "ocols.ModuleProperty\"F\n\022VirtualBattleCou" + + "nt\022\014\n\004type\030\001 \001(\005\022\r\n\005count\030\002 \001(\005\022\023\n\013hasBu", + "yCount\030\003 \001(\005\"0\n\017VirtualStarList\022\017\n\007fight" + + "Id\030\001 \001(\005\022\014\n\004star\030\002 \003(\005\"\220\001\n\020VirtualEliteB" + + "oss\022\020\n\010username\030\001 \001(\t\022\014\n\004head\030\002 \001(\005\022\017\n\007f" + + "ightId\030\003 \001(\005\022\020\n\010viplevel\030\004 \001(\005\0229\n\010teamIn" + + "fo\030\005 \001(\0132\'.com.ljsd.jieling.protocols.Te" + + "amOneInfo\",\n\010TankInfo\022\016\n\006tankId\030\001 \001(\t\022\020\n" + + "\010remainHp\030\002 \001(\001\"Z\n\rFriendSupport\022\013\n\003uid\030" + + "\001 \001(\005\022\014\n\004name\030\002 \001(\t\022.\n\004tank\030\003 \001(\0132 .com." + + "ljsd.jieling.protocols.Hero\"+\n\020WelfareRe" + + "dPacket\022\n\n\002id\030\001 \001(\005\022\013\n\003num\030\002 \001(\005\"N\n\013Jour", + "neyInfo\022\r\n\005mapId\030\001 \001(\005\022\017\n\007process\030\002 \001(\005\022" + + "\020\n\010redPoint\030\003 \001(\005\022\r\n\005first\030\004 \001(\005\"\213\001\n\022Jou" + + "rneyMonsterInfo\022\021\n\tmonsterId\030\001 \001(\005\022\024\n\014mo" + + "nsterIndex\030\002 \001(\005\022\021\n\tmonsterHp\030\003 \001(\003\022\022\n\nr" + + "emainTime\030\004 \001(\005\022\021\n\tattackNum\030\005 \001(\005\022\022\n\nre" + + "wardShow\030\006 \001(\005\"K\n\020JourneyGoodsInfo\022\017\n\007go" + + "odsId\030\001 \001(\005\022\022\n\ngoodsIndex\030\002 \001(\005\022\022\n\nremai" + + "nTime\030\003 \001(\005\"S\n\013JourneyCell\022\016\n\006cellId\030\001 \001" + + "(\005\022\017\n\007pointId\030\002 \001(\005\022\021\n\tcellIndex\030\003 \001(\005\022\020" + + "\n\010rewardId\030\004 \001(\005\"K\n\021BattleMissionInfo\022\021\n", + "\tmissionId\030\001 \001(\005\022\017\n\007takTime\030\002 \001(\005\022\022\n\nvip" + + "takTime\030\003 \001(\005\"\034\n\rRandomRequest\022\013\n\003sex\030\001 " + + "\001(\005\"d\n\026BattlePassInfoResponse\022\r\n\005pross\030\001" + + " \001(\005\022;\n\004info\030\002 \003(\0132-.com.ljsd.jieling.pr" + + "otocols.BattleMissionInfo\"@\n\032GetBattlePa" + + "ssRewardRequest\022\021\n\tmissionId\030\001 \001(\005\022\017\n\007ge" + + "tType\030\002 \001(\005\"\200\001\n\033GetBattlePassRewardRespo" + + "nse\022.\n\004drop\030\001 \001(\0132 .com.ljsd.jieling.pro" + + "tocols.Drop\0221\n\007vipdrop\030\002 \001(\0132 .com.ljsd." + + "jieling.protocols.Drop\"\200\001\n\013RankingInfo\022\n", + "\n\002id\030\001 \001(\005\022\013\n\003uid\030\002 \001(\005\022\r\n\005level\030\003 \001(\005\022\014" + + "\n\004name\030\004 \001(\t\022\014\n\004head\030\005 \001(\005\022\014\n\004rank\030\006 \001(\005" + + "\022\021\n\theadFrame\030\007 \001(\005\022\014\n\004time\030\010 \001(\003\",\n\nHer" + + "oLuxury\022\n\n\002id\030\001 \001(\005\022\022\n\nfreeStatus\030\002 \001(\005\"" + + "X\n\016CampSimpleInfo\022\014\n\004camp\030\001 \001(\005\022\020\n\010total" + + "Num\030\002 \001(\005\022\022\n\ntotalFight\030\003 \001(\005\022\022\n\ntotalSc" + + "ore\030\004 \001(\005\"+\n\nFightEntry\022\016\n\006teamId\030\001 \001(\005\022" + + "\r\n\005fight\030\002 \001(\005\"\300\001\n\016UserSimpleInfo\022\020\n\010ser" + + "verId\030\001 \001(\005\022\016\n\006userId\030\002 \001(\005\022\020\n\010headIcon\030" + + "\003 \001(\005\022\021\n\theadFrame\030\004 \001(\005\022\020\n\010nickName\030\005 \001", + "(\t\0228\n\010fightMap\030\006 \003(\0132&.com.ljsd.jieling." + + "protocols.FightEntry\022\014\n\004camp\030\007 \001(\005\022\r\n\005le" + + "vel\030\010 \001(\005\"\327\001\n\021CampWarPlayerInfo\022B\n\016userS" + + "impleInfo\030\001 \001(\0132*.com.ljsd.jieling.proto" + + "cols.UserSimpleInfo\022\r\n\005score\030\002 \001(\005\022\023\n\013fi" + + "ghtResult\030\003 \001(\005\022\023\n\013changeScore\030\004 \001(\005\022E\n\014" + + "battleRecord\030\005 \001(\0132/.com.ljsd.jieling.pr" + + "otocols.CampWarBattleRecord\"\336\001\n\023CampWarB" + + "attleRecord\022\026\n\016battleRecordId\030\001 \001(\t\022\022\n\nc" + + "reateTime\030\002 \001(\003\022\024\n\014attackerUser\030\003 \001(\005\022\024\n", + "\014defenderUser\030\004 \001(\005\022\022\n\nwinnerUser\030\005 \001(\005\022" + + "\023\n\013changeScore\030\006 \001(\005\0228\n\tfightData\030\007 \001(\0132" + + "%.com.ljsd.jieling.protocols.FightData\022\014" + + "\n\004star\030\010 \001(\005\"\177\n\034CampWarRankingListPlayer" + + "Info\022B\n\016userSimpleInfo\030\001 \001(\0132*.com.ljsd." + + "jieling.protocols.UserSimpleInfo\022\r\n\005scor" + + "e\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\"\232\001\n\026CampWarRanking" + + "ListInfo\022H\n\006top100\030\001 \003(\01328.com.ljsd.jiel" + + "ing.protocols.CampWarRankingListPlayerIn" + + "fo\022\021\n\tselfScore\030\002 \001(\005\022\020\n\010selfRank\030\003 \001(\005\022", + "\021\n\tselfFight\030\004 \001(\005\"o\n\025MonthCardRechargeI" + + "nfo\022\023\n\013monthCardId\030\001 \001(\005\022\032\n\022realRecharge" + + "Amount\030\002 \001(\001\022%\n\035welfareCurrencyRechargeA" + + "mount\030\003 \001(\001\"<\n\021PrivilegeCardInfo\022\016\n\006card" + + "Id\030\001 \001(\005\022\027\n\017takeDailyReward\030\002 \001(\010B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -143834,7 +144043,7 @@ public final class CommonProto { internal_static_com_ljsd_jieling_protocols_Hero_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_Hero_descriptor, - new java.lang.String[] { "Id", "HeroId", "Level", "BreakId", "Star", "SkinId", "EquipIdList", "CreateTime", "StarBreakId", "EspecialEquipLevel", "SoulPos", "LockState", "Jewels", "Createtype", "ChangeId", "WarWaySlot1", "WarWaySlot2", "RemainHp", "CombatPlans", "Medal", "Suit", "AdjustUnLock", "PositionSkills", "TotemId", "Plan", "WarWaySlot3", }); + new java.lang.String[] { "Id", "HeroId", "Level", "BreakId", "Star", "SkinId", "EquipIdList", "CreateTime", "StarBreakId", "EspecialEquipLevel", "SoulPos", "LockState", "Jewels", "Createtype", "ChangeId", "WarWaySlot1", "WarWaySlot2", "RemainHp", "CombatPlans", "Medal", "Suit", "AdjustUnLock", "PositionSkills", "TotemId", "Plan", "WarWaySlot3", "GiftEquipIds", }); internal_static_com_ljsd_jieling_protocols_FightUnitInfo_descriptor = getDescriptor().getMessageTypes().get(15); internal_static_com_ljsd_jieling_protocols_FightUnitInfo_fieldAccessorTable = new diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java index a98711f..37e9618 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java @@ -37,6 +37,7 @@ public interface GlobalItemType { int TITLE = 29;//称号 int TOTEM = 30;//图腾 int ITEM_FRAGMENT = 31;//图腾 + int HERO_GIFT = 56;//英雄 //物品使用类型 int NO_USE = 0 ; //不使用 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 3d40792..bea526b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -296,6 +296,7 @@ public class CBean2Proto { .addAllAdjustUnLock(adjustUnLock) .addAllPositionSkills(positionSkillsList) .setTotemId(hero.getTotemId()) + .addAllGiftEquipIds(hero.getHeroGiftEquipList()) .build(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 492aca3..1111070 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -728,6 +728,8 @@ public class ItemUtil { return motherShipPlan; case GlobalItemType.TITLE: return titleMap; + case GlobalItemType.HERO_GIFT: + return equipMap; default: LOGGER.error("新增类型请通知后端"); return new HashMap<>(); @@ -755,6 +757,7 @@ public class ItemUtil { case GlobalItemType.RIDE: case GlobalItemType.SELECTSecretBox: case GlobalItemType.ITEM_FRAGMENT: + case GlobalItemType.HERO_GIFT: itemType = GlobalItemType.ITEM; break; case GlobalItemType.RANDOM_ITME: @@ -1425,6 +1428,7 @@ public class ItemUtil { filter.add(GlobalItemType.EQUIP); filter.add(GlobalItemType.ESPECIAL_EQUIP); filter.add(GlobalItemType.JEWEL); + filter.add(GlobalItemType.HERO_GIFT); SGameSetting gameSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting(); int hasEquipNum = user.getEquipManager().getEquipMap().size(); @@ -1435,6 +1439,9 @@ public class ItemUtil { if (itemType == GlobalItemType.EQUIP) { return true; } +// if (itemType == GlobalItemType.HERO_GIFT) { +// return true; +// } return false; }).collect(Collectors.toSet()).size(); @@ -1629,7 +1636,7 @@ public class ItemUtil { SItem item = SItem.getsItemMap().get(equipId); int itemType = item.getItemType(); String msgTem = ""; - if (itemType == GlobalItemType.EQUIP) { + if (itemType == GlobalItemType.EQUIP || itemType == GlobalItemType.HERO_GIFT) { Equip equip = new Equip(user.getId(), equipId); equipManager.addEquip(user, equip); equipList.add(CBean2Proto.getEquipProto(equip));