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 cf984da91..a121d3d64 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java @@ -3868,6 +3868,24 @@ public final class CommonProto { * */ int getUsedTimes(); + + // optional int32 effectTime = 3; + /** + * optional int32 effectTime = 3; + * + *
+     *有效时间
+     * 
+ */ + boolean hasEffectTime(); + /** + * optional int32 effectTime = 3; + * + *
+     *有效时间
+     * 
+ */ + int getEffectTime(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.Privilege} @@ -3930,6 +3948,11 @@ public final class CommonProto { usedTimes_ = input.readInt32(); break; } + case 24: { + bitField0_ |= 0x00000004; + effectTime_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -4018,9 +4041,34 @@ public final class CommonProto { return usedTimes_; } + // optional int32 effectTime = 3; + public static final int EFFECTTIME_FIELD_NUMBER = 3; + private int effectTime_; + /** + * optional int32 effectTime = 3; + * + *
+     *有效时间
+     * 
+ */ + public boolean hasEffectTime() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 effectTime = 3; + * + *
+     *有效时间
+     * 
+ */ + public int getEffectTime() { + return effectTime_; + } + private void initFields() { id_ = 0; usedTimes_ = 0; + effectTime_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -4040,6 +4088,9 @@ public final class CommonProto { if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeInt32(2, usedTimes_); } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeInt32(3, effectTime_); + } getUnknownFields().writeTo(output); } @@ -4057,6 +4108,10 @@ public final class CommonProto { size += com.google.protobuf.CodedOutputStream .computeInt32Size(2, usedTimes_); } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, effectTime_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -4177,6 +4232,8 @@ public final class CommonProto { bitField0_ = (bitField0_ & ~0x00000001); usedTimes_ = 0; bitField0_ = (bitField0_ & ~0x00000002); + effectTime_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -4213,6 +4270,10 @@ public final class CommonProto { to_bitField0_ |= 0x00000002; } result.usedTimes_ = usedTimes_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.effectTime_ = effectTime_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -4235,6 +4296,9 @@ public final class CommonProto { if (other.hasUsedTimes()) { setUsedTimes(other.getUsedTimes()); } + if (other.hasEffectTime()) { + setEffectTime(other.getEffectTime()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -4360,6 +4424,55 @@ public final class CommonProto { return this; } + // optional int32 effectTime = 3; + private int effectTime_ ; + /** + * optional int32 effectTime = 3; + * + *
+       *有效时间
+       * 
+ */ + public boolean hasEffectTime() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 effectTime = 3; + * + *
+       *有效时间
+       * 
+ */ + public int getEffectTime() { + return effectTime_; + } + /** + * optional int32 effectTime = 3; + * + *
+       *有效时间
+       * 
+ */ + public Builder setEffectTime(int value) { + bitField0_ |= 0x00000004; + effectTime_ = value; + onChanged(); + return this; + } + /** + * optional int32 effectTime = 3; + * + *
+       *有效时间
+       * 
+ */ + public Builder clearEffectTime() { + bitField0_ = (bitField0_ & ~0x00000004); + effectTime_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.Privilege) } @@ -45953,6 +46066,24 @@ public final class CommonProto { * */ int getEndTime(); + + // optional int32 dynamicBuyTimes = 5; + /** + * optional int32 dynamicBuyTimes = 5; + * + *
+     *可购买次数
+     * 
+ */ + boolean hasDynamicBuyTimes(); + /** + * optional int32 dynamicBuyTimes = 5; + * + *
+     *可购买次数
+     * 
+ */ + int getDynamicBuyTimes(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.GiftGoodsInfo} @@ -46025,6 +46156,11 @@ public final class CommonProto { endTime_ = input.readInt32(); break; } + case 40: { + bitField0_ |= 0x00000010; + dynamicBuyTimes_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -46161,11 +46297,36 @@ public final class CommonProto { return endTime_; } + // optional int32 dynamicBuyTimes = 5; + public static final int DYNAMICBUYTIMES_FIELD_NUMBER = 5; + private int dynamicBuyTimes_; + /** + * optional int32 dynamicBuyTimes = 5; + * + *
+     *可购买次数
+     * 
+ */ + public boolean hasDynamicBuyTimes() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional int32 dynamicBuyTimes = 5; + * + *
+     *可购买次数
+     * 
+ */ + public int getDynamicBuyTimes() { + return dynamicBuyTimes_; + } + private void initFields() { goodsId_ = 0; buyTimes_ = 0; startTime_ = 0; endTime_ = 0; + dynamicBuyTimes_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -46191,6 +46352,9 @@ public final class CommonProto { if (((bitField0_ & 0x00000008) == 0x00000008)) { output.writeInt32(4, endTime_); } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + output.writeInt32(5, dynamicBuyTimes_); + } getUnknownFields().writeTo(output); } @@ -46216,6 +46380,10 @@ public final class CommonProto { size += com.google.protobuf.CodedOutputStream .computeInt32Size(4, endTime_); } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(5, dynamicBuyTimes_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -46340,6 +46508,8 @@ public final class CommonProto { bitField0_ = (bitField0_ & ~0x00000004); endTime_ = 0; bitField0_ = (bitField0_ & ~0x00000008); + dynamicBuyTimes_ = 0; + bitField0_ = (bitField0_ & ~0x00000010); return this; } @@ -46384,6 +46554,10 @@ public final class CommonProto { to_bitField0_ |= 0x00000008; } result.endTime_ = endTime_; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { + to_bitField0_ |= 0x00000010; + } + result.dynamicBuyTimes_ = dynamicBuyTimes_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -46412,6 +46586,9 @@ public final class CommonProto { if (other.hasEndTime()) { setEndTime(other.getEndTime()); } + if (other.hasDynamicBuyTimes()) { + setDynamicBuyTimes(other.getDynamicBuyTimes()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -46635,6 +46812,55 @@ public final class CommonProto { return this; } + // optional int32 dynamicBuyTimes = 5; + private int dynamicBuyTimes_ ; + /** + * optional int32 dynamicBuyTimes = 5; + * + *
+       *可购买次数
+       * 
+ */ + public boolean hasDynamicBuyTimes() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional int32 dynamicBuyTimes = 5; + * + *
+       *可购买次数
+       * 
+ */ + public int getDynamicBuyTimes() { + return dynamicBuyTimes_; + } + /** + * optional int32 dynamicBuyTimes = 5; + * + *
+       *可购买次数
+       * 
+ */ + public Builder setDynamicBuyTimes(int value) { + bitField0_ |= 0x00000010; + dynamicBuyTimes_ = value; + onChanged(); + return this; + } + /** + * optional int32 dynamicBuyTimes = 5; + * + *
+       *可购买次数
+       * 
+ */ + public Builder clearDynamicBuyTimes() { + bitField0_ = (bitField0_ & ~0x00000010); + dynamicBuyTimes_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.GiftGoodsInfo) } @@ -49799,6 +50025,24 @@ public final class CommonProto { * */ int getForce(); + + // optional int32 guildSign = 9; + /** + * optional int32 guildSign = 9; + * + *
+     *公会图腾
+     * 
+ */ + boolean hasGuildSign(); + /** + * optional int32 guildSign = 9; + * + *
+     *公会图腾
+     * 
+ */ + int getGuildSign(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.UserRank} @@ -49899,6 +50143,11 @@ public final class CommonProto { force_ = input.readInt32(); break; } + case 72: { + bitField0_ |= 0x00000100; + guildSign_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -50155,6 +50404,30 @@ public final class CommonProto { return force_; } + // optional int32 guildSign = 9; + public static final int GUILDSIGN_FIELD_NUMBER = 9; + private int guildSign_; + /** + * optional int32 guildSign = 9; + * + *
+     *公会图腾
+     * 
+ */ + public boolean hasGuildSign() { + return ((bitField0_ & 0x00000100) == 0x00000100); + } + /** + * optional int32 guildSign = 9; + * + *
+     *公会图腾
+     * 
+ */ + public int getGuildSign() { + return guildSign_; + } + private void initFields() { uid_ = 0; level_ = 0; @@ -50164,6 +50437,7 @@ public final class CommonProto { headFrame_ = 0; guildName_ = ""; force_ = 0; + guildSign_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -50201,6 +50475,9 @@ public final class CommonProto { if (((bitField0_ & 0x00000080) == 0x00000080)) { output.writeInt32(8, force_); } + if (((bitField0_ & 0x00000100) == 0x00000100)) { + output.writeInt32(9, guildSign_); + } getUnknownFields().writeTo(output); } @@ -50242,6 +50519,10 @@ public final class CommonProto { size += com.google.protobuf.CodedOutputStream .computeInt32Size(8, force_); } + if (((bitField0_ & 0x00000100) == 0x00000100)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(9, guildSign_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -50379,6 +50660,8 @@ public final class CommonProto { bitField0_ = (bitField0_ & ~0x00000040); force_ = 0; bitField0_ = (bitField0_ & ~0x00000080); + guildSign_ = 0; + bitField0_ = (bitField0_ & ~0x00000100); return this; } @@ -50443,6 +50726,10 @@ public final class CommonProto { to_bitField0_ |= 0x00000080; } result.force_ = force_; + if (((from_bitField0_ & 0x00000100) == 0x00000100)) { + to_bitField0_ |= 0x00000100; + } + result.guildSign_ = guildSign_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -50487,6 +50774,9 @@ public final class CommonProto { if (other.hasForce()) { setForce(other.getForce()); } + if (other.hasGuildSign()) { + setGuildSign(other.getGuildSign()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -51000,6 +51290,55 @@ public final class CommonProto { return this; } + // optional int32 guildSign = 9; + private int guildSign_ ; + /** + * optional int32 guildSign = 9; + * + *
+       *公会图腾
+       * 
+ */ + public boolean hasGuildSign() { + return ((bitField0_ & 0x00000100) == 0x00000100); + } + /** + * optional int32 guildSign = 9; + * + *
+       *公会图腾
+       * 
+ */ + public int getGuildSign() { + return guildSign_; + } + /** + * optional int32 guildSign = 9; + * + *
+       *公会图腾
+       * 
+ */ + public Builder setGuildSign(int value) { + bitField0_ |= 0x00000100; + guildSign_ = value; + onChanged(); + return this; + } + /** + * optional int32 guildSign = 9; + * + *
+       *公会图腾
+       * 
+ */ + public Builder clearGuildSign() { + bitField0_ = (bitField0_ & ~0x00000100); + guildSign_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.UserRank) } @@ -82960,238 +83299,239 @@ public final class CommonProto { " \001(\005\022\021\n\theadFrame\030\022 \001(\005\022\024\n\014roomAddreess\030" + "\023 \001(\t\022\023\n\013designation\030\024 \001(\005\022\021\n\tdecrotion\030" + "\025 \001(\005\022\014\n\004ride\030\026 \001(\005\022\021\n\trideLevel\030\027 \001(\005\022\013" + - "\n\003sex\030\030 \001(\005\"*\n\tPrivilege\022\n\n\002id\030\001 \001(\005\022\021\n\t" + - "usedTimes\030\002 \001(\005\"R\n\004Item\022\016\n\006itemId\030\001 \001(\005\022" + - "\017\n\007itemNum\030\002 \001(\005\022\022\n\nendingTime\030\003 \001(\005\022\025\n\r" + - "nextFlushTime\030\004 \001(\005\";\n\016SpecialEffects\022\022\n" + - "\npropertyId\030\001 \001(\005\022\025\n\rpropertyValue\030\002 \001(\005" + - "\"\206\002\n\005Equip\022\n\n\002id\030\001 \001(\t\022\017\n\007equipId\030\002 \001(\005\022", - "A\n\rmainAttribute\030\003 \001(\0132*.com.ljsd.jielin" + - "g.protocols.SpecialEffects\022C\n\017secondAttr" + - "ibute\030\004 \003(\0132*.com.ljsd.jieling.protocols" + - ".SpecialEffects\022\024\n\014rebuildLevel\030\005 \001(\005\022\022\n" + - "\ncreateTime\030\006 \001(\005\022\017\n\007skillId\030\007 \001(\005\022\020\n\010is" + - "Locked\030\010 \001(\005\022\013\n\003exp\030\t \001(\005\",\n\007SoulPos\022\017\n\007" + - "equipId\030\001 \001(\t\022\020\n\010position\030\002 \001(\005\"\376\001\n\004Hero" + - "\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\006sk" + - "inId\030\006 \001(\005\022\023\n\013equipIdList\030\010 \003(\t\022\022\n\ncreat", - "eTime\030\t \001(\005\022\023\n\013starBreakId\030\n \001(\005\022\025\n\respe" + - "cialEquip\030\013 \003(\t\0224\n\007soulPos\030\014 \003(\0132#.com.l" + - "jsd.jieling.protocols.SoulPos\022\021\n\tlockSta" + - "te\030\r \001(\005\"G\n\rFightUnitInfo\022\016\n\006unitId\030\001 \001(" + - "\t\022\024\n\014unitSkillIds\030\002 \001(\t\022\020\n\010property\030\003 \001(" + - "\t\"\201\001\n\rFightTeamInfo\022@\n\rfightUnitList\030\001 \003" + - "(\0132).com.ljsd.jieling.protocols.FightUni" + - "tInfo\022\025\n\rteamSkillList\030\002 \001(\t\022\027\n\017teamPass" + - "iveList\030\003 \001(\t\"-\n\023EventBehaviorValues\022\026\n\016" + - "behaviorValues\030\001 \003(\005\"y\n\023EventBehaviorCom", - "mon\022\024\n\014behaviorType\030\001 \001(\005\022L\n\023eventBehavi" + - "orValues\030\002 \003(\0132/.com.ljsd.jieling.protoc" + - "ols.EventBehaviorValues\"=\n\004Cell\022\016\n\006cellI" + - "d\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\005sta" + - "te\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\006mailI" + - "d\030\001 \001(\t\022\r\n\005state\030\002 \001(\005\022\014\n\004head\030\003 \001(\t\022\017\n\007" + - "content\030\004 \001(\t\022\020\n\010mailItem\030\005 \001(\t\022\020\n\010sendT" + - "ime\030\006 \001(\005\022\025\n\reffectiveTime\030\007 \001(\005\022\020\n\010send", - "Name\030\010 \001(\t\022\020\n\010mailType\030\t \001(\005\"\220\002\n\004Drop\0222\n" + - "\010itemlist\030\001 \003(\0132 .com.ljsd.jieling.proto" + - "cols.Item\0222\n\007equipId\030\002 \003(\0132!.com.ljsd.ji" + - "eling.protocols.Equip\022.\n\004Hero\030\003 \003(\0132 .co" + - "m.ljsd.jieling.protocols.Hero\022:\n\017especia" + - "lEquipId\030\004 \003(\0132!.com.ljsd.jieling.protoc" + - "ols.Equip\0224\n\tsoulEquip\030\005 \003(\0132!.com.ljsd." + - "jieling.protocols.Equip\"\034\n\tGMCommand\022\017\n\007" + - "command\030\001 \001(\t\"0\n\014TeamHeroInfo\022\020\n\010positio" + - "n\030\001 \001(\005\022\016\n\006heroId\030\002 \001(\t\"6\n\017TeamPokemonIn", - "fo\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\010teamN" + - "ame\030\002 \001(\t\022?\n\rteamHeroInfos\030\003 \003(\0132(.com.l" + - "jsd.jieling.protocols.TeamHeroInfo\022E\n\020te" + - "amPokemonInfos\030\004 \003(\0132+.com.ljsd.jieling." + - "protocols.TeamPokemonInfo\"-\n\020Pokemoncomo" + - "npent\022\n\n\002id\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\"p\n\013Poke" + - "monInfo\022\n\n\002id\030\001 \001(\005\022\r\n\005stage\030\002 \001(\005\022F\n\020po" + - "kemoncomonpent\030\003 \003(\0132,.com.ljsd.jieling." + - "protocols.Pokemoncomonpent\">\n\014RingFireIn", - "fo\022\n\n\002id\030\001 \001(\005\022\r\n\005stage\030\002 \001(\005\022\023\n\013comonpe" + - "ntId\030\003 \003(\005\"<\n\020WorkShopBaseInfo\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\022Work" + - "ShopUnLockInfo\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.FightTeamInf" + - "o\022>\n\013monsterList\030\002 \003(\0132).com.ljsd.jielin" + - "g.protocols.FightTeamInfo\022\021\n\tfightSeed\030\003" + - " \001(\005\022\024\n\014fightMaxTime\030\004 \001(\005\022\021\n\tfightType\030" + - "\005 \001(\005\"-\n\rExploreDetail\022\n\n\002id\030\001 \001(\005\022\020\n\010pr", - "ogress\030\002 \001(\005\"0\n\nFoodBuffer\022\020\n\010bufferId\030\001" + - " \001(\005\022\020\n\010leftStep\030\002 \001(\005\"/\n\023NewPlayerGuide" + - "Point\022\014\n\004type\030\001 \001(\005\022\n\n\002id\030\002 \001(\005\"L\n\017Level" + - "Difficulty\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\024LevelDi" + - "fficultyInfos\022\016\n\006areaId\030\001 \001(\005\022D\n\017LevelDi" + - "fficulty\030\002 \003(\0132+.com.ljsd.jieling.protoc" + - "ols.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\007", - "mission\030\002 \003(\01324.com.ljsd.jieling.protoco" + - "ls.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\nreallyOpen\030\004 \001(\005\032A\n\013MissionInfo\022\021\n\tmis" + - "sionId\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." + - "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\005le" + - "vel\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\"\027\n\004Team\022\017\n\007her" + - "oTid\030\001 \003(\005\"}\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\"~\n\tArenaInfo\022\020\n\010failNu" + - "ms\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&.com.ljsd.jie" + - "ling.protocols.ArenaEnemy\"\'\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\tsto" + - "reItem\030\006 \003(\0132%.com.ljsd.jieling.protocol" + - "s.StoreItem\"\236\001\n\017ArenaRecordInfo\022\n\n\002id\030\001 " + - "\001(\t\022?\n\nattackInfo\030\002 \001(\0132+.com.ljsd.jieli" + - "ng.protocols.ArenaPersonInfo\022\022\n\nattackTi" + - "me\030\003 \001(\005\022\025\n\rmyScoreChange\030\004 \001(\005\022\023\n\013fight" + - "Result\030\005 \001(\005\"Z\n\016FunctionOfTime\022\022\n\nfuncti" + - "onId\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\025AdventureRan" + - "kItemInfo\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\021Adv" + - "entureBossInfo\022\017\n\007arenaId\030\001 \001(\005\022\017\n\007findU" + - "id\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(\005\022\025\n\rb" + - "ossRemainlHp\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\010" + - "progress\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\010vipLevel\030\001 \001(\005\022\027\n\017hadTa" + - "keLevelBox\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\013offLineTime" + - "\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\005f" + - "rame\030\r \001(\005\022\017\n\007soulVal\030\016 \001(\005\"V\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\"7\n\021G" + - "oodsTypeDuration\022\021\n\tgoodsType\030\001 \001(\005\022\017\n\007e" + - "ndTime\030\002 \001(\005\"/\n\016TechnologyInfo\022\016\n\006techId", - "\030\001 \001(\005\022\r\n\005levle\030\002 \001(\005\"J\n\020SuddenlyBossInf" + - "o\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\ntemplat" + - "eId\030\001 \001(\005\022\017\n\007overlap\030\002 \001(\005\022\027\n\017nextRefres" + - "hTime\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\"\263\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.jieling.prot" + - "ocols.RankInfo\022\021\n\theadFrame\030\006 \001(\005\022\021\n\tgui", - "ldName\030\007 \001(\t\022\r\n\005force\030\010 \001(\005\"\204\001\n\025ActorEff" + - "ectBufferInfo\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\006t" + - "arget\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\006heroId\030\001 \001(\t\022\016\n\006" + - "heroHp\030\002 \001(\005\022\021\n\theroMaxHp\030\003 \001(\005\022\017\n\007heroT" + - "id\030\004 \001(\005\"%\n\010SceneMsg\022\014\n\004time\030\001 \001(\005\022\013\n\003ms" + - "g\030\002 \001(\t\"\'\n\nPosMineral\022\013\n\003pos\030\001 \001(\005\022\014\n\004nu" + - "ms\030\002 \001(\005\"\264\001\n\010Creature\022\014\n\004path\030\001 \003(\005\022\r\n\005s" + - "peed\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\010heroI" + - "nfo\030\007 \003(\0132*.com.ljsd.jieling.protocols.B" + - "loodyHeroInfo\022\020\n\010killNums\030\010 \001(\005\"\217\001\n\nScen" + - "eActor\022\n\n\002id\030\001 \001(\005\022\016\n\006curPos\030\002 \001(\005\022\r\n\005st" + - "ate\030\003 \001(\005\022\014\n\004type\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\006roomI" + - "d\030\001 \001(\005\022\r\n\005mapId\030\002 \001(\005\022:\n\nSceneActor\030\003 \003" + - "(\0132&.com.ljsd.jieling.protocols.SceneAct" + - "or\022P\n\025actorEffectBufferInfo\030\004 \003(\01321.com.", - "ljsd.jieling.protocols.ActorEffectBuffer" + - "Info\022\024\n\014barrierPoint\030\005 \003(\005\022:\n\nposMineral" + - "\030\006 \003(\0132&.com.ljsd.jieling.protocols.PosM" + - "ineral\022\022\n\nremainTime\030\007 \001(\005\"S\n\027SceneGetFu" + - "llMsgResponse\0228\n\tsceneInfo\030\001 \001(\0132%.com.l" + - "jsd.jieling.protocols.SceneInfo\"B\n\013bless" + - "Reward\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\022fiveResetTowerInf" + - "o\022\r\n\005tower\030\001 \001(\005\022\020\n\010intoType\030\002 \001(\005\";\n\020Fa" + - "milyContribute\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\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\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\013fightR" + - "esult\030\013 \001(\0132,.com.ljsd.jieling.protocols" + - ".FamilyContribute\022\027\n\017playerIntoLevel\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\006cellId\030\001 " + - "\001(\005\022\014\n\004time\030\002 \001(\005\"u\n\014UseForceInfo\022\014\n\004nam", - "e\030\001 \001(\t\022\014\n\004leve\030\002 \001(\005\022\r\n\005force\030\003 \001(\005\022\014\n\004" + - "rank\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\006cellId\030\002 \001(\005\022\014\n\004info\030\003 \001(\t\022\014\n\004" + - "type\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\nS" + - "ignInInfo\022\014\n\004days\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\"N" + - "\n\016TeamSimpleInfo\022\016\n\006heroid\030\001 \001(\t\022\017\n\007hero" + - "Tid\030\002 \001(\005\022\014\n\004star\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\"\207", - "\001\n\017TeamOneTeamInfo\0228\n\004team\030\001 \003(\0132*.com.l" + - "jsd.jieling.protocols.TeamSimpleInfo\022\024\n\014" + - "PokemonInfos\030\002 \003(\005\022\022\n\ntotalForce\030\003 \001(\005\022\020" + - "\n\010remainHp\030\004 \003(\005\"\271\001\n\013TeamOneInfo\022\013\n\003uid\030" + - "\001 \001(\005\022\r\n\005level\030\002 \001(\005\022\014\n\004name\030\003 \001(\t\022\014\n\004he" + - "ad\030\004 \001(\005\022\021\n\theadFrame\030\005 \001(\005\022\021\n\tguildName" + - "\030\007 \001(\t\0229\n\004team\030\006 \001(\0132+.com.ljsd.jieling." + - "protocols.TeamOneTeamInfo\022\021\n\tisApplyed\030\010" + - " \001(\005\"y\n\017MonsterRankInfo\022\014\n\004name\030\001 \001(\t\022\r\n" + - "\005score\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\022\r\n\005level\030\004 \001(", - "\005\022\014\n\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\022\013\n\003ui" + - "d\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\005ma" + - "pId\030\001 \001(\005\022\022\n\nworldLevel\030\002 \001(\005\022\022\n\nbloodSc" + - "ore\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\014EndlessPoint\022\020\n" + - "\010location\030\001 \001(\005\022\021\n\tmonsterId\030\002 \001(\005\"2\n\014St" + - "rongerInfo\022\020\n\010curScore\030\001 \001(\005\022\020\n\010maxScore" + - "\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\nans", - "werType\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\026Lu" + - "ckWheelRewardPosInfo\022\013\n\003pos\030\001 \001(\005\022\016\n\006luc" + - "kId\030\002 \001(\005\022\021\n\tluckTimes\030\003 \001(\005\"W\n\013RefreshT" + - "ask\022\014\n\004type\030\001 \001(\005\022:\n\005tasks\030\002 \003(\0132+.com.l" + - "jsd.jieling.protocols.UserMissionInfo\"\221\001" + - "\n\021MainLevelRankInfo\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\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\theadFrame\030\010 \001(\005\"B\n\017ChampionBet" + - "Info\022\n\n\002id\030\001 \001(\t\022\020\n\010redCoins\030\002 \001(\005\022\021\n\tbl" + - "ueCoins\030\003 \001(\005\"\323\001\n\022ChampionBattleInfo\0227\n\006" + - "myInfo\030\001 \001(\0132\'.com.ljsd.jieling.protocol" + - "s.TeamOneInfo\022:\n\tenemyInfo\030\002 \001(\0132\'.com.l" + - "jsd.jieling.protocols.TeamOneInfo\022\016\n\006res" + - "ult\030\003 \001(\005\0228\n\tfightData\030\004 \001(\0132%.com.ljsd." + - "jieling.protocols.FightData\"\367\001\n\026Champion" + - "BattlePairInfo\022;\n\nattackInfo\030\001 \001(\0132\'.com", - ".ljsd.jieling.protocols.TeamOneInfo\0228\n\007d" + - "efInfo\030\002 \001(\0132\'.com.ljsd.jieling.protocol" + - "s.TeamOneInfo\022\023\n\013fightResult\030\003 \001(\005\022\n\n\002id" + - "\030\004 \001(\t\022\022\n\nroundTImes\030\005 \001(\005\022\016\n\006teamId\030\006 \001" + - "(\005\022\020\n\010position\030\007 \001(\005\022\017\n\007isGUess\030\010 \001(\005B\002H" + - "\001" + "\n\003sex\030\030 \001(\005\">\n\tPrivilege\022\n\n\002id\030\001 \001(\005\022\021\n\t" + + "usedTimes\030\002 \001(\005\022\022\n\neffectTime\030\003 \001(\005\"R\n\004I" + + "tem\022\016\n\006itemId\030\001 \001(\005\022\017\n\007itemNum\030\002 \001(\005\022\022\n\n" + + "endingTime\030\003 \001(\005\022\025\n\rnextFlushTime\030\004 \001(\005\"" + + ";\n\016SpecialEffects\022\022\n\npropertyId\030\001 \001(\005\022\025\n" + + "\rpropertyValue\030\002 \001(\005\"\206\002\n\005Equip\022\n\n\002id\030\001 \001", + "(\t\022\017\n\007equipId\030\002 \001(\005\022A\n\rmainAttribute\030\003 \001" + + "(\0132*.com.ljsd.jieling.protocols.SpecialE" + + "ffects\022C\n\017secondAttribute\030\004 \003(\0132*.com.lj" + + "sd.jieling.protocols.SpecialEffects\022\024\n\014r" + + "ebuildLevel\030\005 \001(\005\022\022\n\ncreateTime\030\006 \001(\005\022\017\n" + + "\007skillId\030\007 \001(\005\022\020\n\010isLocked\030\010 \001(\005\022\013\n\003exp\030" + + "\t \001(\005\",\n\007SoulPos\022\017\n\007equipId\030\001 \001(\t\022\020\n\010pos" + + "ition\030\002 \001(\005\"\376\001\n\004Hero\022\n\n\002id\030\001 \001(\t\022\016\n\006hero" + + "Id\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\013equipI", + "dList\030\010 \003(\t\022\022\n\ncreateTime\030\t \001(\005\022\023\n\013starB" + + "reakId\030\n \001(\005\022\025\n\respecialEquip\030\013 \003(\t\0224\n\007s" + + "oulPos\030\014 \003(\0132#.com.ljsd.jieling.protocol" + + "s.SoulPos\022\021\n\tlockState\030\r \001(\005\"G\n\rFightUni" + + "tInfo\022\016\n\006unitId\030\001 \001(\t\022\024\n\014unitSkillIds\030\002 " + + "\001(\t\022\020\n\010property\030\003 \001(\t\"\201\001\n\rFightTeamInfo\022" + + "@\n\rfightUnitList\030\001 \003(\0132).com.ljsd.jielin" + + "g.protocols.FightUnitInfo\022\025\n\rteamSkillLi" + + "st\030\002 \001(\t\022\027\n\017teamPassiveList\030\003 \001(\t\"-\n\023Eve" + + "ntBehaviorValues\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" + + ".ljsd.jieling.protocols.EventBehaviorVal" + + "ues\"=\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\005state\030\002 \001(\t\022\023\n\013missionS" + + "tep\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\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\010mai" + + "lItem\030\005 \001(\t\022\020\n\010sendTime\030\006 \001(\005\022\025\n\reffecti", + "veTime\030\007 \001(\005\022\020\n\010sendName\030\010 \001(\t\022\020\n\010mailTy" + + "pe\030\t \001(\005\"\220\002\n\004Drop\0222\n\010itemlist\030\001 \003(\0132 .co" + + "m.ljsd.jieling.protocols.Item\0222\n\007equipId" + + "\030\002 \003(\0132!.com.ljsd.jieling.protocols.Equi" + + "p\022.\n\004Hero\030\003 \003(\0132 .com.ljsd.jieling.proto" + + "cols.Hero\022:\n\017especialEquipId\030\004 \003(\0132!.com" + + ".ljsd.jieling.protocols.Equip\0224\n\tsoulEqu" + + "ip\030\005 \003(\0132!.com.ljsd.jieling.protocols.Eq" + + "uip\"\034\n\tGMCommand\022\017\n\007command\030\001 \001(\t\"0\n\014Tea" + + "mHeroInfo\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\006t" + + "eamId\030\001 \001(\005\022\020\n\010teamName\030\002 \001(\t\022?\n\rteamHer" + + "oInfos\030\003 \003(\0132(.com.ljsd.jieling.protocol" + + "s.TeamHeroInfo\022E\n\020teamPokemonInfos\030\004 \003(\013" + + "2+.com.ljsd.jieling.protocols.TeamPokemo" + + "nInfo\"-\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(\013" + + "2,.com.ljsd.jieling.protocols.Pokemoncom", + "onpent\">\n\014RingFireInfo\022\n\n\002id\030\001 \001(\005\022\r\n\005st" + + "age\030\002 \001(\005\022\023\n\013comonpentId\030\003 \003(\005\"<\n\020WorkSh" + + "opBaseInfo\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\004ty" + + "pe\030\001 \001(\005\022\n\n\002id\030\004 \003(\005\"\312\001\n\tFightData\022A\n\016he" + + "roFightInfos\030\001 \001(\0132).com.ljsd.jieling.pr" + + "otocols.FightTeamInfo\022>\n\013monsterList\030\002 \003" + + "(\0132).com.ljsd.jieling.protocols.FightTea" + + "mInfo\022\021\n\tfightSeed\030\003 \001(\005\022\024\n\014fightMaxTime" + + "\030\004 \001(\005\022\021\n\tfightType\030\005 \001(\005\"-\n\rExploreDeta", + "il\022\n\n\002id\030\001 \001(\005\022\020\n\010progress\030\002 \001(\005\"0\n\nFood" + + "Buffer\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\007fightI" + + "d\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\022\013\n\003num\030\003 \001(\005\022\014\n\004t" + + "ype\030\004 \001(\005\"l\n\024LevelDifficultyInfos\022\016\n\006are" + + "aId\030\001 \001(\005\022D\n\017LevelDifficulty\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\n", + "activityId\030\001 \002(\005\022E\n\007mission\030\002 \003(\01324.com." + + "ljsd.jieling.protocols.ActivityInfo.Miss" + + "ionInfo\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\010prog" + + "ress\030\002 \002(\005\022\r\n\005state\030\003 \002(\005\"J\n\nGmResponse\022" + + ".\n\004drop\030\001 \001(\0132 .com.ljsd.jieling.protoco" + + "ls.Drop\022\014\n\004info\030\002 \001(\t\"\215\001\n\017ArenaPersonInf" + + "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\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\"\027\n\004Team\022\017\n\007heroTid\030\001 \003(\005\"}\n\nArenaE" + + "nemy\022?\n\npersonInfo\030\001 \001(\0132+.com.ljsd.jiel" + + "ing.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\013successN" + + "ums\030\002 \001(\005\022\r\n\005score\030\003 \001(\005\022;\n\013arenaEnemys\030" + + "\004 \003(\0132&.com.ljsd.jieling.protocols.Arena" + + "Enemy\"\'\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\017last", + "RefreshTime\030\002 \001(\003\022\021\n\tstartTime\030\004 \001(\003\022\017\n\007" + + "endTime\030\005 \001(\003\0228\n\tstoreItem\030\006 \003(\0132%.com.l" + + "jsd.jieling.protocols.StoreItem\"\236\001\n\017Aren" + + "aRecordInfo\022\n\n\002id\030\001 \001(\t\022?\n\nattackInfo\030\002 " + + "\001(\0132+.com.ljsd.jieling.protocols.ArenaPe" + + "rsonInfo\022\022\n\nattackTime\030\003 \001(\005\022\025\n\rmyScoreC" + + "hange\030\004 \001(\005\022\023\n\013fightResult\030\005 \001(\005\"Z\n\016Func" + + "tionOfTime\022\022\n\nfunctionId\030\001 \001(\005\022\021\n\tstartT" + + "ime\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\003uid\030\007 \001(\005\"\313\001\n\021AdventureBossInfo\022\017\n\007ar" + + "enaId\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(\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\005st" + + "ate\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\010vip" + + "Level\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\002lv\030" + + "\003 \001(\005\022\023\n\013offLineTime\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\005frame\030\r \001(\005\022\017\n\007soulVa" + + "l\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\006t" + + "echId\030\001 \001(\005\022\r\n\005levle\030\002 \001(\005\"J\n\020SuddenlyBo" + + "ssInfo\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\nte" + + "mplateId\030\001 \001(\005\022\017\n\007overlap\030\002 \001(\005\022\027\n\017nextR" + + "efreshTime\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\006pa" + + "ram3\030\004 \001(\005\"\306\001\n\010UserRank\022\013\n\003uid\030\001 \001(\005\022\r\n\005" + + "level\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\tguil" + + "dSign\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\006c" + + "aster\030\006 \001(\005\022\r\n\005value\030\007 \003(\005\"T\n\016BloodyHero" + + "Info\022\016\n\006heroId\030\001 \001(\t\022\016\n\006heroHp\030\002 \001(\005\022\021\n\t" + + "heroMaxHp\030\003 \001(\005\022\017\n\007heroTid\030\004 \001(\005\"%\n\010Scen" + + "eMsg\022\014\n\004time\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\"\'\n\nPosMi" + + "neral\022\013\n\003pos\030\001 \001(\005\022\014\n\004nums\030\002 \001(\005\"\264\001\n\010Cre", + "ature\022\014\n\004path\030\001 \003(\005\022\r\n\005speed\030\002 \001(\005\022\r\n\005ma" + + "xHp\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*.com." + + "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\004typ" + + "e\030\004 \001(\005\0226\n\010Creature\030\006 \001(\0132$.com.ljsd.jie" + + "ling.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\nSceneActor\030\003 \003(\0132&.com.ljsd.ji", + "eling.protocols.SceneActor\022P\n\025actorEffec" + + "tBufferInfo\030\004 \003(\01321.com.ljsd.jieling.pro" + + "tocols.ActorEffectBufferInfo\022\024\n\014barrierP" + + "oint\030\005 \003(\005\022:\n\nposMineral\030\006 \003(\0132&.com.ljs" + + "d.jieling.protocols.PosMineral\022\022\n\nremain" + + "Time\030\007 \001(\005\"S\n\027SceneGetFullMsgResponse\0228\n" + + "\tsceneInfo\030\001 \001(\0132%.com.ljsd.jieling.prot" + + "ocols.SceneInfo\"B\n\013blessReward\022\022\n\nlocati" + + "onId\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\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\"" + + "\210\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\003" + + "exp\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\tl" + + "evelTime\030\n \001(\005\022A\n\013fightResult\030\013 \001(\0132,.co" + + "m.ljsd.jieling.protocols.FamilyContribut" + + "e\022\027\n\017playerIntoLevel\030\014 \001(\005\")\n\013endlessHer" + + "o\022\016\n\006heroId\030\001 \001(\t\022\n\n\002hp\030\002 \001(\005\"2\n\022Endless", + "RefreshInfo\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\004leve\030" + + "\002 \001(\005\022\r\n\005force\030\003 \001(\005\022\014\n\004rank\030\004 \001(\005\022\014\n\004he" + + "ad\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\006cellId" + + "\030\002 \001(\005\022\014\n\004info\030\003 \001(\t\022\014\n\004type\030\004 \001(\005\"g\n\nEx" + + "pertInfo\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\004day" + + "s\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\"N\n\016TeamSimpleInfo", + "\022\016\n\006heroid\030\001 \001(\t\022\017\n\007heroTid\030\002 \001(\005\022\014\n\004sta" + + "r\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\"\207\001\n\017TeamOneTeamIn" + + "fo\0228\n\004team\030\001 \003(\0132*.com.ljsd.jieling.prot" + + "ocols.TeamSimpleInfo\022\024\n\014PokemonInfos\030\002 \003" + + "(\005\022\022\n\ntotalForce\030\003 \001(\005\022\020\n\010remainHp\030\004 \003(\005" + + "\"\271\001\n\013TeamOneInfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002" + + " \001(\005\022\014\n\004name\030\003 \001(\t\022\014\n\004head\030\004 \001(\005\022\021\n\thead" + + "Frame\030\005 \001(\005\022\021\n\tguildName\030\007 \001(\t\0229\n\004team\030\006" + + " \001(\0132+.com.ljsd.jieling.protocols.TeamOn" + + "eTeamInfo\022\021\n\tisApplyed\030\010 \001(\005\"y\n\017MonsterR", + "ankInfo\022\014\n\004name\030\001 \001(\t\022\r\n\005score\030\002 \001(\005\022\014\n\004" + + "rank\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\rHeroB" + + "loodInfo\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\nwor" + + "ldLevel\030\002 \001(\005\022\022\n\nbloodScore\030\003 \001(\005\"2\n\017Pla" + + "yerBindPhone\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\010cu" + + "rScore\030\001 \001(\005\022\020\n\010maxScore\030\002 \001(\005\"U\n\017Questi", + "onOptions\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\010" + + "serverId\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\026LuckWheelRewardPos" + + "Info\022\013\n\003pos\030\001 \001(\005\022\016\n\006luckId\030\002 \001(\005\022\021\n\tluc" + + "kTimes\030\003 \001(\005\"W\n\013RefreshTask\022\014\n\004type\030\001 \001(" + + "\005\022:\n\005tasks\030\002 \003(\0132+.com.ljsd.jieling.prot" + + "ocols.UserMissionInfo\"\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(\005B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -83215,7 +83555,7 @@ public final class CommonProto { internal_static_com_ljsd_jieling_protocols_Privilege_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_Privilege_descriptor, - new java.lang.String[] { "Id", "UsedTimes", }); + new java.lang.String[] { "Id", "UsedTimes", "EffectTime", }); internal_static_com_ljsd_jieling_protocols_Item_descriptor = getDescriptor().getMessageTypes().get(3); internal_static_com_ljsd_jieling_protocols_Item_fieldAccessorTable = new @@ -83491,7 +83831,7 @@ public final class CommonProto { internal_static_com_ljsd_jieling_protocols_GiftGoodsInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_GiftGoodsInfo_descriptor, - new java.lang.String[] { "GoodsId", "BuyTimes", "StartTime", "EndTime", }); + new java.lang.String[] { "GoodsId", "BuyTimes", "StartTime", "EndTime", "DynamicBuyTimes", }); internal_static_com_ljsd_jieling_protocols_GoodsTypeDuration_descriptor = getDescriptor().getMessageTypes().get(48); internal_static_com_ljsd_jieling_protocols_GoodsTypeDuration_fieldAccessorTable = new @@ -83527,7 +83867,7 @@ public final class CommonProto { internal_static_com_ljsd_jieling_protocols_UserRank_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_UserRank_descriptor, - new java.lang.String[] { "Uid", "Level", "Head", "UserName", "RankInfo", "HeadFrame", "GuildName", "Force", }); + new java.lang.String[] { "Uid", "Level", "Head", "UserName", "RankInfo", "HeadFrame", "GuildName", "Force", "GuildSign", }); internal_static_com_ljsd_jieling_protocols_ActorEffectBufferInfo_descriptor = getDescriptor().getMessageTypes().get(54); internal_static_com_ljsd_jieling_protocols_ActorEffectBufferInfo_fieldAccessorTable = new diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java index 808f5dc85..fa5e70466 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java @@ -2511,6 +2511,24 @@ public final class Family { */ com.google.protobuf.ByteString getNameBytes(); + + // optional int32 gender = 5; + /** + * optional int32 gender = 5; + * + *
+     * 性别
+     * 
+ */ + boolean hasGender(); + /** + * optional int32 gender = 5; + * + *
+     * 性别
+     * 
+ */ + int getGender(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.FamilyWalkIndicaiton} @@ -2599,6 +2617,11 @@ public final class Family { name_ = input.readBytes(); break; } + case 40: { + bitField0_ |= 0x00000008; + gender_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -2780,11 +2803,36 @@ public final class Family { } } + // optional int32 gender = 5; + public static final int GENDER_FIELD_NUMBER = 5; + private int gender_; + /** + * optional int32 gender = 5; + * + *
+     * 性别
+     * 
+ */ + public boolean hasGender() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional int32 gender = 5; + * + *
+     * 性别
+     * 
+ */ + public int getGender() { + return gender_; + } + private void initFields() { path_ = java.util.Collections.emptyList(); curPos_ = 0; uid_ = 0; name_ = ""; + gender_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2810,6 +2858,9 @@ public final class Family { if (((bitField0_ & 0x00000004) == 0x00000004)) { output.writeBytes(4, getNameBytes()); } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeInt32(5, gender_); + } getUnknownFields().writeTo(output); } @@ -2840,6 +2891,10 @@ public final class Family { size += com.google.protobuf.CodedOutputStream .computeBytesSize(4, getNameBytes()); } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(5, gender_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -2964,6 +3019,8 @@ public final class Family { bitField0_ = (bitField0_ & ~0x00000004); name_ = ""; bitField0_ = (bitField0_ & ~0x00000008); + gender_ = 0; + bitField0_ = (bitField0_ & ~0x00000010); return this; } @@ -3009,6 +3066,10 @@ public final class Family { to_bitField0_ |= 0x00000004; } result.name_ = name_; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { + to_bitField0_ |= 0x00000008; + } + result.gender_ = gender_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -3046,6 +3107,9 @@ public final class Family { name_ = other.name_; onChanged(); } + if (other.hasGender()) { + setGender(other.getGender()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -3363,6 +3427,55 @@ public final class Family { return this; } + // optional int32 gender = 5; + private int gender_ ; + /** + * optional int32 gender = 5; + * + *
+       * 性别
+       * 
+ */ + public boolean hasGender() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional int32 gender = 5; + * + *
+       * 性别
+       * 
+ */ + public int getGender() { + return gender_; + } + /** + * optional int32 gender = 5; + * + *
+       * 性别
+       * 
+ */ + public Builder setGender(int value) { + bitField0_ |= 0x00000010; + gender_ = value; + onChanged(); + return this; + } + /** + * optional int32 gender = 5; + * + *
+       * 性别
+       * 
+ */ + public Builder clearGender() { + bitField0_ = (bitField0_ & ~0x00000010); + gender_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.FamilyWalkIndicaiton) } @@ -36514,117 +36627,118 @@ public final class Family { "uteToday\030\007 \001(\005\022\021\n\tsoulForce\030\010 \001(\005\022\014\n\004hea" + "d\030\t \001(\005\022\r\n\005frame\030\n \001(\005\"9\n\rFamilyLogInfo\022" + "\014\n\004name\030\001 \001(\t\022\014\n\004info\030\002 \001(\t\022\014\n\004time\030\003 \001(" + - "\005\"O\n\024FamilyWalkIndicaiton\022\014\n\004path\030\001 \003(\005\022" + + "\005\"_\n\024FamilyWalkIndicaiton\022\014\n\004path\030\001 \003(\005\022" + "\016\n\006curPos\030\002 \001(\005\022\013\n\003uid\030\003 \001(\005\022\014\n\004name\030\004 \001", - "(\t\"\210\001\n\013FamilyApply\022\014\n\004name\030\001 \001(\t\022\017\n\007role" + - "Uid\030\002 \001(\005\022\014\n\004time\030\003 \001(\005\022\r\n\005frame\030\004 \001(\005\022\017" + - "\n\007outTime\030\005 \001(\005\022\r\n\005level\030\006 \001(\005\022\017\n\007forece" + - "s\030\007 \001(\005\022\014\n\004head\030\010 \001(\005\"l\n\020FamilyNoticeInf" + - "o\022\023\n\013guildNotice\030\001 \002(\t\022\022\n\nupdateTime\030\002 \002" + - "(\005\022\r\n\005steps\030\003 \003(\005\022\020\n\010adminres\030\004 \003(\005\022\016\n\006h" + - "asNew\030\005 \002(\005\"i\n\022FamilyRecomandInfo\022B\n\016fam" + - "ilyBaseInfo\030\001 \001(\0132*.com.ljsd.jieling.pro" + - "tocols.FamilyBaseInfo\022\017\n\007isApply\030\002 \001(\005\"U" + - "\n\020FamilyDefendInfo\022\013\n\003uid\030\001 \001(\005\022\021\n\tstarC", - "ount\030\002 \001(\005\022\017\n\007buildId\030\003 \001(\005\022\020\n\010curForce\030" + - "\004 \001(\005\"6\n\023FamilyBuildBuffInfo\022\017\n\007buildId\030" + - "\001 \001(\005\022\016\n\006buffId\030\002 \003(\005\"y\n\025FamilyFightPlay" + - "erInfo\022<\n\010userInfo\030\001 \001(\0132*.com.ljsd.jiel" + - "ing.protocols.FamilyUserInfo\022\021\n\tstarCoun" + - "t\030\002 \001(\005\022\017\n\007buildId\030\003 \001(\005\"\243\001\n\017FamilyFight" + - "Info\022\013\n\003gid\030\001 \001(\005\022B\n\tbuildBuff\030\002 \003(\0132/.c" + - "om.ljsd.jieling.protocols.FamilyBuildBuf" + - "fInfo\022?\n\004user\030\003 \003(\01321.com.ljsd.jieling.p" + - "rotocols.FamilyFightPlayerInfo\"\357\001\n\025GetFa", - "milyInfoResponse\022B\n\016familyBaseInfo\030\001 \001(\013" + - "2*.com.ljsd.jieling.protocols.FamilyBase" + - "Info\022B\n\016familyUserInfo\030\002 \001(\0132*.com.ljsd." + - "jieling.protocols.FamilyUserInfo\022N\n\024fami" + - "lyWalkIndicaiton\030\003 \003(\01320.com.ljsd.jielin" + - "g.protocols.FamilyWalkIndicaiton\"5\n\023Fami" + - "lyCreateReqeust\022\014\n\004name\030\001 \001(\t\022\020\n\010announc" + - "e\030\002 \001(\t\"\356\001\n\024FamilyCreateResponse\022B\n\016fami" + + "(\t\022\016\n\006gender\030\005 \001(\005\"\210\001\n\013FamilyApply\022\014\n\004na" + + "me\030\001 \001(\t\022\017\n\007roleUid\030\002 \001(\005\022\014\n\004time\030\003 \001(\005\022" + + "\r\n\005frame\030\004 \001(\005\022\017\n\007outTime\030\005 \001(\005\022\r\n\005level" + + "\030\006 \001(\005\022\017\n\007foreces\030\007 \001(\005\022\014\n\004head\030\010 \001(\005\"l\n" + + "\020FamilyNoticeInfo\022\023\n\013guildNotice\030\001 \002(\t\022\022" + + "\n\nupdateTime\030\002 \002(\005\022\r\n\005steps\030\003 \003(\005\022\020\n\010adm" + + "inres\030\004 \003(\005\022\016\n\006hasNew\030\005 \002(\005\"i\n\022FamilyRec" + + "omandInfo\022B\n\016familyBaseInfo\030\001 \001(\0132*.com." + + "ljsd.jieling.protocols.FamilyBaseInfo\022\017\n" + + "\007isApply\030\002 \001(\005\"U\n\020FamilyDefendInfo\022\013\n\003ui", + "d\030\001 \001(\005\022\021\n\tstarCount\030\002 \001(\005\022\017\n\007buildId\030\003 " + + "\001(\005\022\020\n\010curForce\030\004 \001(\005\"6\n\023FamilyBuildBuff" + + "Info\022\017\n\007buildId\030\001 \001(\005\022\016\n\006buffId\030\002 \003(\005\"y\n" + + "\025FamilyFightPlayerInfo\022<\n\010userInfo\030\001 \001(\013" + + "2*.com.ljsd.jieling.protocols.FamilyUser" + + "Info\022\021\n\tstarCount\030\002 \001(\005\022\017\n\007buildId\030\003 \001(\005" + + "\"\243\001\n\017FamilyFightInfo\022\013\n\003gid\030\001 \001(\005\022B\n\tbui" + + "ldBuff\030\002 \003(\0132/.com.ljsd.jieling.protocol" + + "s.FamilyBuildBuffInfo\022?\n\004user\030\003 \003(\01321.co" + + "m.ljsd.jieling.protocols.FamilyFightPlay", + "erInfo\"\357\001\n\025GetFamilyInfoResponse\022B\n\016fami" + "lyBaseInfo\030\001 \001(\0132*.com.ljsd.jieling.prot" + - "ocols.FamilyBaseInfo\022B\n\016familyUserInfo\030\002", + "ocols.FamilyBaseInfo\022B\n\016familyUserInfo\030\002" + " \001(\0132*.com.ljsd.jieling.protocols.Family" + - "UserInfo\022N\n\024familyWalkIndicaiton\030\003 \001(\01320" + + "UserInfo\022N\n\024familyWalkIndicaiton\030\003 \003(\01320" + ".com.ljsd.jieling.protocols.FamilyWalkIn" + - "dicaiton\"#\n\023FamilySearchReqeust\022\014\n\004name\030" + - "\001 \001(\t\"a\n\023FamilySeachResponse\022J\n\022familyRe" + - "comandInfo\030\001 \003(\0132..com.ljsd.jieling.prot" + - "ocols.FamilyRecomandInfo\"&\n\022FamilyApplyR" + - "equest\022\020\n\010familyId\030\001 \003(\005\"\235\001\n\023FamilyJoinI" + - "ndicaion\022B\n\016familyBaseInfo\030\001 \001(\0132*.com.l" + + "dicaiton\"5\n\023FamilyCreateReqeust\022\014\n\004name\030" + + "\001 \001(\t\022\020\n\010announce\030\002 \001(\t\"\356\001\n\024FamilyCreate" + + "Response\022B\n\016familyBaseInfo\030\001 \001(\0132*.com.l" + "jsd.jieling.protocols.FamilyBaseInfo\022B\n\016", "familyUserInfo\030\002 \001(\0132*.com.ljsd.jieling." + - "protocols.FamilyUserInfo\"%\n\021FamilyJoinRe" + - "quest\022\020\n\010familyId\030\001 \001(\005\"b\n\022FamilyJoinRes" + - "ponse\022L\n\023familyJoinIndicaion\030\001 \001(\0132/.com" + - ".ljsd.jieling.protocols.FamilyJoinIndica" + - "ion\"e\n\027FamilyRecommandResponse\022J\n\022family" + - "RecomandInfo\030\001 \003(\0132..com.ljsd.jieling.pr" + - "otocols.FamilyRecomandInfo\"a\n\033GetFamilyM" + - "emberInfoResponse\022B\n\016familyUserInfo\030\001 \003(" + - "\0132*.com.ljsd.jieling.protocols.FamilyUse", - "rInfo\"X\n\024GetFamilyLogResponse\022@\n\rfamilyL" + - "ogInfo\030\001 \003(\0132).com.ljsd.jieling.protocol" + - "s.FamilyLogInfo\"V\n\026GetFamilyApplyRespons" + - "e\022<\n\013familyApply\030\001 \003(\0132\'.com.ljsd.jielin" + - "g.protocols.FamilyApply\"<\n\033FamilyOperati" + - "onApplyRequest\022\014\n\004type\030\001 \001(\005\022\017\n\007applyId\030" + - "\002 \001(\005\")\n\024FamilyKickOutRequest\022\021\n\ttargetU" + - "id\030\001 \001(\005\"?\n\030FamilyAppointmentReqeust\022\021\n\t" + - "targetUid\030\001 \001(\005\022\020\n\010position\030\002 \001(\005\"?\n\036Fam" + - "ilyPositionUpdateIndication\022\020\n\010position\030", - "\001 \001(\005\022\013\n\003uid\030\002 \001(\005\"4\n\023FamilyChangeReques" + - "t\022\014\n\004type\030\001 \001(\005\022\017\n\007content\030\002 \001(\t\"3\n\024Fami" + - "lyChangeResponse\022\016\n\006result\030\001 \001(\005\022\013\n\003err\030" + - "\002 \001(\t\">\n\033FamilyChangeJoinTypeRequest\022\014\n\004" + - "type\030\001 \001(\005\022\021\n\tintoLevel\030\002 \001(\005\"\\\n\026FamilyC" + - "hangeIndication\022B\n\016familyBaseInfo\030\001 \001(\0132" + - "*.com.ljsd.jieling.protocols.FamilyBaseI" + - "nfo\"0\n\033FamilyChairmanChangeRequest\022\021\n\tta" + - "rgetUid\030\001 \001(\005\"(\n\030FamilyDissolutionReques" + - "t\022\014\n\004type\030\001 \001(\005\"V\n\030FamilyDefendViewRespo", - "nse\022:\n\004info\030\001 \003(\0132,.com.ljsd.jieling.pro" + - "tocols.FamilyDefendInfo\">\n\035FamilyDefendD" + - "etailViewRequest\022\020\n\010playerId\030\001 \001(\005\022\013\n\003gi" + - "d\030\002 \001(\005\"_\n\036FamilyDefendDetailViewRespons" + - "e\022=\n\010teamInfo\030\001 \001(\0132+.com.ljsd.jieling.p" + - "rotocols.TeamOneTeamInfo\"8\n\030FamilyQuickD" + - "efendRequest\022\017\n\007buildId\030\001 \001(\005\022\013\n\003uid\030\002 \001" + - "(\005\"!\n\021FamilyWalkRequest\022\014\n\004path\030\001 \003(\005\"T\n" + - "\027FamilyFightInfoResponse\0229\n\004info\030\001 \003(\0132+" + - ".com.ljsd.jieling.protocols.FamilyFightI", - "nfo\"q\n\013EnemyFamily\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002" + - " \001(\t\022\r\n\005level\030\003 \001(\005\022\021\n\tpictureId\030\004 \001(\005\022\021" + - "\n\ttotalStar\030\005 \001(\005\022\023\n\013myTotalStar\030\006 \001(\005\"\310" + - "\001\n\030FamilyFightRoundResponse\022\014\n\004type\030\001 \001(" + - "\005\022\021\n\tstartTime\030\002 \001(\005\022\026\n\016roundStartTime\030\003" + - " \001(\005\022\024\n\014roundEndTime\030\004 \001(\005\022\020\n\010joinType\030\005" + - " \001(\005\0226\n\005enemy\030\006 \001(\0132\'.com.ljsd.jieling.p" + - "rotocols.EnemyFamily\022\023\n\013attackCount\030\007 \001(" + - "\005\":\n\030FamilyFightAttackRequest\022\021\n\tattackU" + - "id\030\001 \001(\005\022\013\n\003gid\030\002 \001(\005\"s\n\031FamilyFightAtta", - "ckResponse\022\016\n\006result\030\001 \001(\005\022\021\n\tstarCount\030" + - "\002 \001(\005\0223\n\004data\030\003 \001(\0132%.com.ljsd.jieling.p" + - "rotocols.FightData\"\231\001\n\023PersonalFightResu" + - "lt\022\014\n\004rank\030\001 \001(\005\022\013\n\003uid\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\020\n\010" + - "position\030\006 \001(\005\022\023\n\013attackCount\030\007 \001(\005\022\021\n\ts" + - "tarCount\030\010 \001(\005\"*\n\032PersonalFightResultReq" + - "uest\022\014\n\004type\030\001 \001(\005\"^\n\033PersonalFightResul" + - "tResponse\022?\n\006result\030\001 \003(\0132/.com.ljsd.jie" + - "ling.protocols.PersonalFightResult\"j\n\030Gu", - "ildFightResultResponse\022\016\n\006getExp\030\001 \001(\005\022\014" + - "\n\004star\030\002 \003(\005\022\021\n\textraStar\030\003 \003(\005\022\r\n\005level" + - "\030\004 \001(\005\022\016\n\006curExp\030\005 \001(\005\"3\n\016DefeatResponse" + - "\022\013\n\003uid\030\001 \001(\005\022\024\n\014teamLostStar\030\002 \001(\005\"#\n\021C" + - "hangeIconRequest\022\016\n\006iconId\030\001 \001(\005\"V\n\032GetA" + - "ttackHeroBloodResponse\0228\n\005blood\030\001 \003(\0132)." + - "com.ljsd.jieling.protocols.HeroBloodInfo" + - "\" \n\020RefuseJoinFamily\022\014\n\004name\030\001 \001(\t\" \n\021Ki" + - "ckOutIndication\022\013\n\003uid\030\001 \001(\005B\002H\001" + "protocols.FamilyUserInfo\022N\n\024familyWalkIn" + + "dicaiton\030\003 \001(\01320.com.ljsd.jieling.protoc" + + "ols.FamilyWalkIndicaiton\"#\n\023FamilySearch" + + "Reqeust\022\014\n\004name\030\001 \001(\t\"a\n\023FamilySeachResp" + + "onse\022J\n\022familyRecomandInfo\030\001 \003(\0132..com.l" + + "jsd.jieling.protocols.FamilyRecomandInfo" + + "\"&\n\022FamilyApplyRequest\022\020\n\010familyId\030\001 \003(\005" + + "\"\235\001\n\023FamilyJoinIndicaion\022B\n\016familyBaseIn" + + "fo\030\001 \001(\0132*.com.ljsd.jieling.protocols.Fa", + "milyBaseInfo\022B\n\016familyUserInfo\030\002 \001(\0132*.c" + + "om.ljsd.jieling.protocols.FamilyUserInfo" + + "\"%\n\021FamilyJoinRequest\022\020\n\010familyId\030\001 \001(\005\"" + + "b\n\022FamilyJoinResponse\022L\n\023familyJoinIndic" + + "aion\030\001 \001(\0132/.com.ljsd.jieling.protocols." + + "FamilyJoinIndicaion\"e\n\027FamilyRecommandRe" + + "sponse\022J\n\022familyRecomandInfo\030\001 \003(\0132..com" + + ".ljsd.jieling.protocols.FamilyRecomandIn" + + "fo\"a\n\033GetFamilyMemberInfoResponse\022B\n\016fam" + + "ilyUserInfo\030\001 \003(\0132*.com.ljsd.jieling.pro", + "tocols.FamilyUserInfo\"X\n\024GetFamilyLogRes" + + "ponse\022@\n\rfamilyLogInfo\030\001 \003(\0132).com.ljsd." + + "jieling.protocols.FamilyLogInfo\"V\n\026GetFa" + + "milyApplyResponse\022<\n\013familyApply\030\001 \003(\0132\'" + + ".com.ljsd.jieling.protocols.FamilyApply\"" + + "<\n\033FamilyOperationApplyRequest\022\014\n\004type\030\001" + + " \001(\005\022\017\n\007applyId\030\002 \001(\005\")\n\024FamilyKickOutRe" + + "quest\022\021\n\ttargetUid\030\001 \001(\005\"?\n\030FamilyAppoin" + + "tmentReqeust\022\021\n\ttargetUid\030\001 \001(\005\022\020\n\010posit" + + "ion\030\002 \001(\005\"?\n\036FamilyPositionUpdateIndicat", + "ion\022\020\n\010position\030\001 \001(\005\022\013\n\003uid\030\002 \001(\005\"4\n\023Fa" + + "milyChangeRequest\022\014\n\004type\030\001 \001(\005\022\017\n\007conte" + + "nt\030\002 \001(\t\"3\n\024FamilyChangeResponse\022\016\n\006resu" + + "lt\030\001 \001(\005\022\013\n\003err\030\002 \001(\t\">\n\033FamilyChangeJoi" + + "nTypeRequest\022\014\n\004type\030\001 \001(\005\022\021\n\tintoLevel\030" + + "\002 \001(\005\"\\\n\026FamilyChangeIndication\022B\n\016famil" + + "yBaseInfo\030\001 \001(\0132*.com.ljsd.jieling.proto" + + "cols.FamilyBaseInfo\"0\n\033FamilyChairmanCha" + + "ngeRequest\022\021\n\ttargetUid\030\001 \001(\005\"(\n\030FamilyD" + + "issolutionRequest\022\014\n\004type\030\001 \001(\005\"V\n\030Famil", + "yDefendViewResponse\022:\n\004info\030\001 \003(\0132,.com." + + "ljsd.jieling.protocols.FamilyDefendInfo\"" + + ">\n\035FamilyDefendDetailViewRequest\022\020\n\010play" + + "erId\030\001 \001(\005\022\013\n\003gid\030\002 \001(\005\"_\n\036FamilyDefendD" + + "etailViewResponse\022=\n\010teamInfo\030\001 \001(\0132+.co" + + "m.ljsd.jieling.protocols.TeamOneTeamInfo" + + "\"8\n\030FamilyQuickDefendRequest\022\017\n\007buildId\030" + + "\001 \001(\005\022\013\n\003uid\030\002 \001(\005\"!\n\021FamilyWalkRequest\022" + + "\014\n\004path\030\001 \003(\005\"T\n\027FamilyFightInfoResponse" + + "\0229\n\004info\030\001 \003(\0132+.com.ljsd.jieling.protoc", + "ols.FamilyFightInfo\"q\n\013EnemyFamily\022\n\n\002id" + + "\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\r\n\005level\030\003 \001(\005\022\021\n\tp" + + "ictureId\030\004 \001(\005\022\021\n\ttotalStar\030\005 \001(\005\022\023\n\013myT" + + "otalStar\030\006 \001(\005\"\310\001\n\030FamilyFightRoundRespo" + + "nse\022\014\n\004type\030\001 \001(\005\022\021\n\tstartTime\030\002 \001(\005\022\026\n\016" + + "roundStartTime\030\003 \001(\005\022\024\n\014roundEndTime\030\004 \001" + + "(\005\022\020\n\010joinType\030\005 \001(\005\0226\n\005enemy\030\006 \001(\0132\'.co" + + "m.ljsd.jieling.protocols.EnemyFamily\022\023\n\013" + + "attackCount\030\007 \001(\005\":\n\030FamilyFightAttackRe" + + "quest\022\021\n\tattackUid\030\001 \001(\005\022\013\n\003gid\030\002 \001(\005\"s\n", + "\031FamilyFightAttackResponse\022\016\n\006result\030\001 \001" + + "(\005\022\021\n\tstarCount\030\002 \001(\005\0223\n\004data\030\003 \001(\0132%.co" + + "m.ljsd.jieling.protocols.FightData\"\231\001\n\023P" + + "ersonalFightResult\022\014\n\004rank\030\001 \001(\005\022\013\n\003uid\030" + + "\002 \001(\005\022\014\n\004name\030\003 \001(\t\022\014\n\004head\030\004 \001(\005\022\021\n\thea" + + "dFrame\030\005 \001(\005\022\020\n\010position\030\006 \001(\005\022\023\n\013attack" + + "Count\030\007 \001(\005\022\021\n\tstarCount\030\010 \001(\005\"*\n\032Person" + + "alFightResultRequest\022\014\n\004type\030\001 \001(\005\"^\n\033Pe" + + "rsonalFightResultResponse\022?\n\006result\030\001 \003(" + + "\0132/.com.ljsd.jieling.protocols.PersonalF", + "ightResult\"j\n\030GuildFightResultResponse\022\016" + + "\n\006getExp\030\001 \001(\005\022\014\n\004star\030\002 \003(\005\022\021\n\textraSta" + + "r\030\003 \003(\005\022\r\n\005level\030\004 \001(\005\022\016\n\006curExp\030\005 \001(\005\"3" + + "\n\016DefeatResponse\022\013\n\003uid\030\001 \001(\005\022\024\n\014teamLos" + + "tStar\030\002 \001(\005\"#\n\021ChangeIconRequest\022\016\n\006icon" + + "Id\030\001 \001(\005\"V\n\032GetAttackHeroBloodResponse\0228" + + "\n\005blood\030\001 \003(\0132).com.ljsd.jieling.protoco" + + "ls.HeroBloodInfo\" \n\020RefuseJoinFamily\022\014\n\004" + + "name\030\001 \001(\t\" \n\021KickOutIndication\022\013\n\003uid\030\001" + + " \001(\005B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -36648,7 +36762,7 @@ public final class Family { internal_static_com_ljsd_jieling_protocols_FamilyWalkIndicaiton_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_FamilyWalkIndicaiton_descriptor, - new java.lang.String[] { "Path", "CurPos", "Uid", "Name", }); + new java.lang.String[] { "Path", "CurPos", "Uid", "Name", "Gender", }); internal_static_com_ljsd_jieling_protocols_FamilyApply_descriptor = getDescriptor().getMessageTypes().get(3); internal_static_com_ljsd_jieling_protocols_FamilyApply_fieldAccessorTable = new diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java index 168034a8c..099e2cc0d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java @@ -50,6 +50,8 @@ public interface ActivityType { int NEW_WELFARE = 42;//萌新福利 int LIMIT_RANDOM_CARD = 43;//限时抽卡 + int LIMIT_UP_CARD = 50;//指定英雄进行升星 + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java index 2a2b0bfca..54e73a917 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java @@ -38,6 +38,7 @@ public enum ActivityTypeEnum { LUCK_WHEEL_ADVANCE(ActivityType.LUCK_WHEEL_ADVANCE, LuckWheelAdvancedActivity::new), NEW_WELFARE(ActivityType.NEW_WELFARE, NewWelfareActivity::new), LIMIT_RANDOM_CARD(ActivityType.LIMIT_RANDOM_CARD,LimitRandomCardActivity::new), + LIMIT_UP_CARD(ActivityType.LIMIT_UP_CARD,LimitUpCardActivity::new), ; private int type; private Function toActivityFunction; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitUpCardActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitUpCardActivity.java new file mode 100644 index 000000000..3bda7cddb --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitUpCardActivity.java @@ -0,0 +1,58 @@ +package com.ljsd.jieling.logic.activity; + +import com.ljsd.jieling.db.redis.RedisKey; +import com.ljsd.jieling.db.redis.RedisUtil; +import com.ljsd.jieling.logic.OnlineUserManager; +import com.ljsd.jieling.logic.activity.event.HeroUpStarEvent; +import com.ljsd.jieling.logic.activity.event.IEvent; +import com.ljsd.jieling.logic.activity.event.Poster; +import com.ljsd.jieling.logic.activity.event.RandomCardEvent; +import com.ljsd.jieling.logic.dao.ActivityMission; +import com.ljsd.jieling.logic.dao.ActivityProgressInfo; +import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.network.session.ISession; +import config.SActivityRewardConfig; + + +import java.util.Map; + +public class LimitUpCardActivity extends AbstractActivity { + public LimitUpCardActivity(int id) { + super(id); + Poster.getPoster().listenEvent(this, HeroUpStarEvent.class); + } + + @Override + public void onEvent(IEvent event) throws Exception { + if (!(event instanceof HeroUpStarEvent)) + return; + HeroUpStarEvent heroUpStarEvent = (HeroUpStarEvent) event; + User user = UserManager.getUser(heroUpStarEvent.getUid()); + ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(id); + Map activityProgressInfoMap = activityMission.getActivityProgressInfoMap(); + + for (SActivityRewardConfig sActivityRewardConfig : SActivityRewardConfig.getsActivityRewardConfigByActivityId(id)) { + if (heroUpStarEvent.getHeroTid() == sActivityRewardConfig.getValues()[0][0] && heroUpStarEvent.getStar() == sActivityRewardConfig.getValues()[0][1]) { + ActivityProgressInfo activityProgressInfo = activityProgressInfoMap.getOrDefault(sActivityRewardConfig.getId(), null); + if (null == activityProgressInfo) + continue; + activityProgressInfo.setProgrss(activityProgressInfo.getProgrss() + 1); + activityMission.updateProgressInfo(sActivityRewardConfig.getId(), activityProgressInfo); + } + } + //更新进度 + ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId()); + sendActivityProgress(sessionByUid, activityMission, null); + } + + @Override + boolean takeRewardsProcess(ISession session, SActivityRewardConfig sActivityRewardConfig, ActivityProgressInfo activityProgressInfo) throws Exception { + int[][] values = sActivityRewardConfig.getValues(); + int missionProgress = activityProgressInfo.getProgrss(); + if (missionProgress < values[1][0]) { + return false; + } + return true; + } +} \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/event/HeroUpStarEvent.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/event/HeroUpStarEvent.java index ef5a4bf05..d09142624 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/event/HeroUpStarEvent.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/event/HeroUpStarEvent.java @@ -7,9 +7,11 @@ public class HeroUpStarEvent implements IEvent { private int uid; private int star; + private int heroTid; - public HeroUpStarEvent(int uid, int star) { + public HeroUpStarEvent(int uid,int heroTid, int star) { this.uid = uid; + this.heroTid = heroTid; this.star = star; } @@ -20,4 +22,8 @@ public class HeroUpStarEvent implements IEvent { public int getUid() { return uid; } + + public int getHeroTid() { + return heroTid; + } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index aa2068b50..72804a73e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -797,7 +797,7 @@ public class HeroLogic{ CommonProto.Drop.Builder baseBuilder = ItemLogic.getInstance().decomposeHero(session,new LinkedList<>(removeHeroIds),Collections.singleton(26),MessageTypeProto.MessageType.UP_HERO_STAR_RESPONSE_VALUE); // recyleHeroBySystem(user,removeHeroIds); targetHero.upStar( 1 ); - Poster.getPoster().dispatchEvent(new HeroUpStarEvent(user.getId(),targetHero.getStar())); + Poster.getPoster().dispatchEvent(new HeroUpStarEvent(user.getId(),targetHero.getTemplateId(),targetHero.getStar())); if(targetHero.getStar()>=5&&targetHero.getStar()!=15){ if(SItem.getsItemMap().get(scHero.getId()).getQuantity()>=5) Poster.getPoster().dispatchEvent(new HeroFiveStarGetEvent(user.getId(),targetHero.getStar()));