diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/ChatProto.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/ChatProto.java index a841f4d23..8023cb1a1 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/ChatProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/ChatProto.java @@ -137,9 +137,9 @@ public final class ChatProto { com.google.protobuf.ByteString getMsgBytes(); - // optional string head = 8; + // optional int32 head = 8; /** - * optional string head = 8; + * optional int32 head = 8; * *
      * 头像
@@ -147,22 +147,13 @@ public final class ChatProto {
      */
     boolean hasHead();
     /**
-     * optional string head = 8;
+     * optional int32 head = 8;
      *
      * 
      * 头像
      * 
*/ - java.lang.String getHead(); - /** - * optional string head = 8; - * - *
-     * 头像
-     * 
- */ - com.google.protobuf.ByteString - getHeadBytes(); + int getHead(); // optional int32 frame = 9; /** @@ -343,6 +334,34 @@ public final class ChatProto { *
*/ int getFrequency(); + + // optional int32 speed = 20; + /** + * optional int32 speed = 20; + */ + boolean hasSpeed(); + /** + * optional int32 speed = 20; + */ + int getSpeed(); + + // optional int32 multiple = 21; + /** + * optional int32 multiple = 21; + * + *
+     *显示次数
+     * 
+ */ + boolean hasMultiple(); + /** + * optional int32 multiple = 21; + * + *
+     *显示次数
+     * 
+ */ + int getMultiple(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.ChatInfo} @@ -425,9 +444,9 @@ public final class ChatProto { msg_ = input.readBytes(); break; } - case 66: { + case 64: { bitField0_ |= 0x00000040; - head_ = input.readBytes(); + head_ = input.readInt32(); break; } case 72: { @@ -480,6 +499,16 @@ public final class ChatProto { frequency_ = input.readInt32(); break; } + case 160: { + bitField0_ |= 0x00020000; + speed_ = input.readInt32(); + break; + } + case 168: { + bitField0_ |= 0x00040000; + multiple_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -726,11 +755,11 @@ public final class ChatProto { } } - // optional string head = 8; + // optional int32 head = 8; public static final int HEAD_FIELD_NUMBER = 8; - private java.lang.Object head_; + private int head_; /** - * optional string head = 8; + * optional int32 head = 8; * *
      * 头像
@@ -740,45 +769,14 @@ public final class ChatProto {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
     /**
-     * optional string head = 8;
+     * optional int32 head = 8;
      *
      * 
      * 头像
      * 
*/ - public java.lang.String getHead() { - java.lang.Object ref = head_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - head_ = s; - } - return s; - } - } - /** - * optional string head = 8; - * - *
-     * 头像
-     * 
- */ - public com.google.protobuf.ByteString - getHeadBytes() { - java.lang.Object ref = head_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - head_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public int getHead() { + return head_; } // optional int32 frame = 9; @@ -1021,6 +1019,46 @@ public final class ChatProto { return frequency_; } + // optional int32 speed = 20; + public static final int SPEED_FIELD_NUMBER = 20; + private int speed_; + /** + * optional int32 speed = 20; + */ + public boolean hasSpeed() { + return ((bitField0_ & 0x00020000) == 0x00020000); + } + /** + * optional int32 speed = 20; + */ + public int getSpeed() { + return speed_; + } + + // optional int32 multiple = 21; + public static final int MULTIPLE_FIELD_NUMBER = 21; + private int multiple_; + /** + * optional int32 multiple = 21; + * + *
+     *显示次数
+     * 
+ */ + public boolean hasMultiple() { + return ((bitField0_ & 0x00040000) == 0x00040000); + } + /** + * optional int32 multiple = 21; + * + *
+     *显示次数
+     * 
+ */ + public int getMultiple() { + return multiple_; + } + private void initFields() { senderId_ = 0; senderName_ = ""; @@ -1028,7 +1066,7 @@ public final class ChatProto { sendervip_ = 0; times_ = 0L; msg_ = ""; - head_ = ""; + head_ = 0; frame_ = 0; soulVal_ = 0; messageId_ = 0L; @@ -1039,6 +1077,8 @@ public final class ChatProto { endTime_ = 0; priorityLevel_ = 0; frequency_ = 0; + speed_ = 0; + multiple_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -1071,7 +1111,7 @@ public final class ChatProto { output.writeBytes(7, getMsgBytes()); } if (((bitField0_ & 0x00000040) == 0x00000040)) { - output.writeBytes(8, getHeadBytes()); + output.writeInt32(8, head_); } if (((bitField0_ & 0x00000080) == 0x00000080)) { output.writeInt32(9, frame_); @@ -1103,6 +1143,12 @@ public final class ChatProto { if (((bitField0_ & 0x00010000) == 0x00010000)) { output.writeInt32(19, frequency_); } + if (((bitField0_ & 0x00020000) == 0x00020000)) { + output.writeInt32(20, speed_); + } + if (((bitField0_ & 0x00040000) == 0x00040000)) { + output.writeInt32(21, multiple_); + } getUnknownFields().writeTo(output); } @@ -1138,7 +1184,7 @@ public final class ChatProto { } if (((bitField0_ & 0x00000040) == 0x00000040)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(8, getHeadBytes()); + .computeInt32Size(8, head_); } if (((bitField0_ & 0x00000080) == 0x00000080)) { size += com.google.protobuf.CodedOutputStream @@ -1180,6 +1226,14 @@ public final class ChatProto { size += com.google.protobuf.CodedOutputStream .computeInt32Size(19, frequency_); } + if (((bitField0_ & 0x00020000) == 0x00020000)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(20, speed_); + } + if (((bitField0_ & 0x00040000) == 0x00040000)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(21, multiple_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -1308,7 +1362,7 @@ public final class ChatProto { bitField0_ = (bitField0_ & ~0x00000010); msg_ = ""; bitField0_ = (bitField0_ & ~0x00000020); - head_ = ""; + head_ = 0; bitField0_ = (bitField0_ & ~0x00000040); frame_ = 0; bitField0_ = (bitField0_ & ~0x00000080); @@ -1330,6 +1384,10 @@ public final class ChatProto { bitField0_ = (bitField0_ & ~0x00008000); frequency_ = 0; bitField0_ = (bitField0_ & ~0x00010000); + speed_ = 0; + bitField0_ = (bitField0_ & ~0x00020000); + multiple_ = 0; + bitField0_ = (bitField0_ & ~0x00040000); return this; } @@ -1426,6 +1484,14 @@ public final class ChatProto { to_bitField0_ |= 0x00010000; } result.frequency_ = frequency_; + if (((from_bitField0_ & 0x00020000) == 0x00020000)) { + to_bitField0_ |= 0x00020000; + } + result.speed_ = speed_; + if (((from_bitField0_ & 0x00040000) == 0x00040000)) { + to_bitField0_ |= 0x00040000; + } + result.multiple_ = multiple_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -1465,9 +1531,7 @@ public final class ChatProto { onChanged(); } if (other.hasHead()) { - bitField0_ |= 0x00000040; - head_ = other.head_; - onChanged(); + setHead(other.getHead()); } if (other.hasFrame()) { setFrame(other.getFrame()); @@ -1499,6 +1563,12 @@ public final class ChatProto { if (other.hasFrequency()) { setFrequency(other.getFrequency()); } + if (other.hasSpeed()) { + setSpeed(other.getSpeed()); + } + if (other.hasMultiple()) { + setMultiple(other.getMultiple()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -1918,10 +1988,10 @@ public final class ChatProto { return this; } - // optional string head = 8; - private java.lang.Object head_ = ""; + // optional int32 head = 8; + private int head_ ; /** - * optional string head = 8; + * optional int32 head = 8; * *
        * 头像
@@ -1931,62 +2001,30 @@ public final class ChatProto {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * optional string head = 8;
+       * optional int32 head = 8;
        *
        * 
        * 头像
        * 
*/ - public java.lang.String getHead() { - java.lang.Object ref = head_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - head_ = s; - return s; - } else { - return (java.lang.String) ref; - } + public int getHead() { + return head_; } /** - * optional string head = 8; + * optional int32 head = 8; * *
        * 头像
        * 
*/ - public com.google.protobuf.ByteString - getHeadBytes() { - java.lang.Object ref = head_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - head_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string head = 8; - * - *
-       * 头像
-       * 
- */ - public Builder setHead( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000040; + public Builder setHead(int value) { + bitField0_ |= 0x00000040; head_ = value; onChanged(); return this; } /** - * optional string head = 8; + * optional int32 head = 8; * *
        * 头像
@@ -1994,24 +2032,7 @@ public final class ChatProto {
        */
       public Builder clearHead() {
         bitField0_ = (bitField0_ & ~0x00000040);
-        head_ = getDefaultInstance().getHead();
-        onChanged();
-        return this;
-      }
-      /**
-       * optional string head = 8;
-       *
-       * 
-       * 头像
-       * 
- */ - public Builder setHeadBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000040; - head_ = value; + head_ = 0; onChanged(); return this; } @@ -2506,6 +2527,88 @@ public final class ChatProto { return this; } + // optional int32 speed = 20; + private int speed_ ; + /** + * optional int32 speed = 20; + */ + public boolean hasSpeed() { + return ((bitField0_ & 0x00020000) == 0x00020000); + } + /** + * optional int32 speed = 20; + */ + public int getSpeed() { + return speed_; + } + /** + * optional int32 speed = 20; + */ + public Builder setSpeed(int value) { + bitField0_ |= 0x00020000; + speed_ = value; + onChanged(); + return this; + } + /** + * optional int32 speed = 20; + */ + public Builder clearSpeed() { + bitField0_ = (bitField0_ & ~0x00020000); + speed_ = 0; + onChanged(); + return this; + } + + // optional int32 multiple = 21; + private int multiple_ ; + /** + * optional int32 multiple = 21; + * + *
+       *显示次数
+       * 
+ */ + public boolean hasMultiple() { + return ((bitField0_ & 0x00040000) == 0x00040000); + } + /** + * optional int32 multiple = 21; + * + *
+       *显示次数
+       * 
+ */ + public int getMultiple() { + return multiple_; + } + /** + * optional int32 multiple = 21; + * + *
+       *显示次数
+       * 
+ */ + public Builder setMultiple(int value) { + bitField0_ |= 0x00040000; + multiple_ = value; + onChanged(); + return this; + } + /** + * optional int32 multiple = 21; + * + *
+       *显示次数
+       * 
+ */ + public Builder clearMultiple() { + bitField0_ = (bitField0_ & ~0x00040000); + multiple_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ChatInfo) } @@ -5644,25 +5747,25 @@ public final class ChatProto { static { java.lang.String[] descriptorData = { "\n\017ChatProto.proto\022\032com.ljsd.jieling.prot" + - "ocols\"\266\002\n\010ChatInfo\022\020\n\010senderId\030\001 \001(\005\022\022\n\n" + + "ocols\"\327\002\n\010ChatInfo\022\020\n\010senderId\030\001 \001(\005\022\022\n\n" + "senderName\030\002 \001(\t\022\023\n\013senderlevel\030\003 \001(\005\022\021\n" + "\tsendervip\030\005 \001(\005\022\r\n\005times\030\006 \001(\004\022\013\n\003msg\030\007" + - " \001(\t\022\014\n\004head\030\010 \001(\t\022\r\n\005frame\030\t \001(\005\022\017\n\007sou" + + " \001(\t\022\014\n\004head\030\010 \001(\005\022\r\n\005frame\030\t \001(\005\022\017\n\007sou" + "lVal\030\n \001(\005\022\021\n\tmessageId\030\013 \001(\004\022\023\n\013message" + "Type\030\r \001(\005\022\016\n\006itemId\030\016 \001(\005\022\014\n\004type\030\017 \001(\005" + "\022\021\n\tstartTime\030\020 \001(\005\022\017\n\007endTime\030\021 \001(\005\022\025\n\r" + - "PriorityLevel\030\022 \001(\005\022\021\n\tFrequency\030\023 \001(\005\"@" + - "\n\031GetChatMessageInfoRequest\022\020\n\010chatType\030", - "\001 \001(\005\022\021\n\tmessageId\030\002 \001(\004\"T\n\032GetChatMessa" + - "geInfoResponse\0226\n\010chatInfo\030\001 \003(\0132$.com.l" + - "jsd.jieling.protocols.ChatInfo\"I\n\022SendCh" + - "atInfoReqest\022\020\n\010chatType\030\001 \001(\005\022\017\n\007messag" + - "e\030\002 \001(\t\022\020\n\010friendId\030\003 \001(\005\"N\n\024SendChatInf" + - "oResponse\0226\n\010chatInfo\030\001 \001(\0132$.com.ljsd.j" + - "ieling.protocols.ChatInfo\"^\n\026SendChatInf" + - "oIndication\0226\n\010chatInfo\030\001 \001(\0132$.com.ljsd" + - ".jieling.protocols.ChatInfo\022\014\n\004type\030\002 \001(" + - "\005B\002H\001" + "PriorityLevel\030\022 \001(\005\022\021\n\tFrequency\030\023 \001(\005\022\r" + + "\n\005speed\030\024 \001(\005\022\020\n\010multiple\030\025 \001(\005\"@\n\031GetCh", + "atMessageInfoRequest\022\020\n\010chatType\030\001 \001(\005\022\021" + + "\n\tmessageId\030\002 \001(\004\"T\n\032GetChatMessageInfoR" + + "esponse\0226\n\010chatInfo\030\001 \003(\0132$.com.ljsd.jie" + + "ling.protocols.ChatInfo\"I\n\022SendChatInfoR" + + "eqest\022\020\n\010chatType\030\001 \001(\005\022\017\n\007message\030\002 \001(\t" + + "\022\020\n\010friendId\030\003 \001(\005\"N\n\024SendChatInfoRespon" + + "se\0226\n\010chatInfo\030\001 \001(\0132$.com.ljsd.jieling." + + "protocols.ChatInfo\"^\n\026SendChatInfoIndica" + + "tion\0226\n\010chatInfo\030\001 \001(\0132$.com.ljsd.jielin" + + "g.protocols.ChatInfo\022\014\n\004type\030\002 \001(\005B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -5674,7 +5777,7 @@ public final class ChatProto { internal_static_com_ljsd_jieling_protocols_ChatInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_ChatInfo_descriptor, - new java.lang.String[] { "SenderId", "SenderName", "Senderlevel", "Sendervip", "Times", "Msg", "Head", "Frame", "SoulVal", "MessageId", "MessageType", "ItemId", "Type", "StartTime", "EndTime", "PriorityLevel", "Frequency", }); + new java.lang.String[] { "SenderId", "SenderName", "Senderlevel", "Sendervip", "Times", "Msg", "Head", "Frame", "SoulVal", "MessageId", "MessageType", "ItemId", "Type", "StartTime", "EndTime", "PriorityLevel", "Frequency", "Speed", "Multiple", }); internal_static_com_ljsd_jieling_protocols_GetChatMessageInfoRequest_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_com_ljsd_jieling_protocols_GetChatMessageInfoRequest_fieldAccessorTable = new diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java index cda32ae77..b27916999 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/CommonProto.java @@ -708,20 +708,15 @@ public final class CommonProto { */ int getFamilyId(); - // optional string head = 7; + // optional int32 head = 7; /** - * optional string head = 7; + * optional int32 head = 7; */ boolean hasHead(); /** - * optional string head = 7; + * optional int32 head = 7; */ - java.lang.String getHead(); - /** - * optional string head = 7; - */ - com.google.protobuf.ByteString - getHeadBytes(); + int getHead(); // optional int32 curMapId = 8; /** @@ -1021,9 +1016,9 @@ public final class CommonProto { familyId_ = input.readInt32(); break; } - case 58: { + case 56: { bitField0_ |= 0x00000040; - head_ = input.readBytes(); + head_ = input.readInt32(); break; } case 64: { @@ -1249,47 +1244,20 @@ public final class CommonProto { return familyId_; } - // optional string head = 7; + // optional int32 head = 7; public static final int HEAD_FIELD_NUMBER = 7; - private java.lang.Object head_; + private int head_; /** - * optional string head = 7; + * optional int32 head = 7; */ public boolean hasHead() { return ((bitField0_ & 0x00000040) == 0x00000040); } /** - * optional string head = 7; + * optional int32 head = 7; */ - public java.lang.String getHead() { - java.lang.Object ref = head_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - head_ = s; - } - return s; - } - } - /** - * optional string head = 7; - */ - public com.google.protobuf.ByteString - getHeadBytes() { - java.lang.Object ref = head_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - head_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public int getHead() { + return head_; } // optional int32 curMapId = 8; @@ -1610,7 +1578,7 @@ public final class CommonProto { exp_ = 0; vipLevel_ = 0; familyId_ = 0; - head_ = ""; + head_ = 0; curMapId_ = 0; energy_ = 0; lastUpdateEnergyTime_ = 0; @@ -1655,7 +1623,7 @@ public final class CommonProto { output.writeInt32(6, familyId_); } if (((bitField0_ & 0x00000040) == 0x00000040)) { - output.writeBytes(7, getHeadBytes()); + output.writeInt32(7, head_); } if (((bitField0_ & 0x00000080) == 0x00000080)) { output.writeInt32(8, curMapId_); @@ -1728,7 +1696,7 @@ public final class CommonProto { } if (((bitField0_ & 0x00000040) == 0x00000040)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(7, getHeadBytes()); + .computeInt32Size(7, head_); } if (((bitField0_ & 0x00000080) == 0x00000080)) { size += com.google.protobuf.CodedOutputStream @@ -1906,7 +1874,7 @@ public final class CommonProto { bitField0_ = (bitField0_ & ~0x00000010); familyId_ = 0; bitField0_ = (bitField0_ & ~0x00000020); - head_ = ""; + head_ = 0; bitField0_ = (bitField0_ & ~0x00000040); curMapId_ = 0; bitField0_ = (bitField0_ & ~0x00000080); @@ -2073,9 +2041,7 @@ public final class CommonProto { setFamilyId(other.getFamilyId()); } if (other.hasHead()) { - bitField0_ |= 0x00000040; - head_ = other.head_; - onChanged(); + setHead(other.getHead()); } if (other.hasCurMapId()) { setCurMapId(other.getCurMapId()); @@ -2381,76 +2347,35 @@ public final class CommonProto { return this; } - // optional string head = 7; - private java.lang.Object head_ = ""; + // optional int32 head = 7; + private int head_ ; /** - * optional string head = 7; + * optional int32 head = 7; */ public boolean hasHead() { return ((bitField0_ & 0x00000040) == 0x00000040); } /** - * optional string head = 7; + * optional int32 head = 7; */ - public java.lang.String getHead() { - java.lang.Object ref = head_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - head_ = s; - return s; - } else { - return (java.lang.String) ref; - } + public int getHead() { + return head_; } /** - * optional string head = 7; + * optional int32 head = 7; */ - public com.google.protobuf.ByteString - getHeadBytes() { - java.lang.Object ref = head_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - head_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string head = 7; - */ - public Builder setHead( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000040; + public Builder setHead(int value) { + bitField0_ |= 0x00000040; head_ = value; onChanged(); return this; } /** - * optional string head = 7; + * optional int32 head = 7; */ public Builder clearHead() { bitField0_ = (bitField0_ & ~0x00000040); - head_ = getDefaultInstance().getHead(); - onChanged(); - return this; - } - /** - * optional string head = 7; - */ - public Builder setHeadBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000040; - head_ = value; + head_ = 0; onChanged(); return this; } @@ -41366,20 +41291,15 @@ public final class CommonProto { */ int getHurt(); - // optional string head = 4; + // optional int32 head = 4; /** - * optional string head = 4; + * optional int32 head = 4; */ boolean hasHead(); /** - * optional string head = 4; + * optional int32 head = 4; */ - java.lang.String getHead(); - /** - * optional string head = 4; - */ - com.google.protobuf.ByteString - getHeadBytes(); + int getHead(); // optional int32 rank = 5; /** @@ -41483,9 +41403,9 @@ public final class CommonProto { hurt_ = input.readInt32(); break; } - case 34: { + case 32: { bitField0_ |= 0x00000008; - head_ = input.readBytes(); + head_ = input.readInt32(); break; } case 40: { @@ -41621,47 +41541,20 @@ public final class CommonProto { return hurt_; } - // optional string head = 4; + // optional int32 head = 4; public static final int HEAD_FIELD_NUMBER = 4; - private java.lang.Object head_; + private int head_; /** - * optional string head = 4; + * optional int32 head = 4; */ public boolean hasHead() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional string head = 4; + * optional int32 head = 4; */ - public java.lang.String getHead() { - java.lang.Object ref = head_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - head_ = s; - } - return s; - } - } - /** - * optional string head = 4; - */ - public com.google.protobuf.ByteString - getHeadBytes() { - java.lang.Object ref = head_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - head_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public int getHead() { + return head_; } // optional int32 rank = 5; @@ -41716,7 +41609,7 @@ public final class CommonProto { level_ = 0; name_ = ""; hurt_ = 0; - head_ = ""; + head_ = 0; rank_ = 0; headFrame_ = 0; } @@ -41742,7 +41635,7 @@ public final class CommonProto { output.writeInt32(3, hurt_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeBytes(4, getHeadBytes()); + output.writeInt32(4, head_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { output.writeInt32(5, rank_); @@ -41773,7 +41666,7 @@ public final class CommonProto { } if (((bitField0_ & 0x00000008) == 0x00000008)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(4, getHeadBytes()); + .computeInt32Size(4, head_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { size += com.google.protobuf.CodedOutputStream @@ -41905,7 +41798,7 @@ public final class CommonProto { bitField0_ = (bitField0_ & ~0x00000002); hurt_ = 0; bitField0_ = (bitField0_ & ~0x00000004); - head_ = ""; + head_ = 0; bitField0_ = (bitField0_ & ~0x00000008); rank_ = 0; bitField0_ = (bitField0_ & ~0x00000010); @@ -41991,9 +41884,7 @@ public final class CommonProto { setHurt(other.getHurt()); } if (other.hasHead()) { - bitField0_ |= 0x00000008; - head_ = other.head_; - onChanged(); + setHead(other.getHead()); } if (other.hasRank()) { setRank(other.getRank()); @@ -42184,76 +42075,35 @@ public final class CommonProto { return this; } - // optional string head = 4; - private java.lang.Object head_ = ""; + // optional int32 head = 4; + private int head_ ; /** - * optional string head = 4; + * optional int32 head = 4; */ public boolean hasHead() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional string head = 4; + * optional int32 head = 4; */ - public java.lang.String getHead() { - java.lang.Object ref = head_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - head_ = s; - return s; - } else { - return (java.lang.String) ref; - } + public int getHead() { + return head_; } /** - * optional string head = 4; + * optional int32 head = 4; */ - public com.google.protobuf.ByteString - getHeadBytes() { - java.lang.Object ref = head_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - head_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string head = 4; - */ - public Builder setHead( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; + public Builder setHead(int value) { + bitField0_ |= 0x00000008; head_ = value; onChanged(); return this; } /** - * optional string head = 4; + * optional int32 head = 4; */ public Builder clearHead() { bitField0_ = (bitField0_ & ~0x00000008); - head_ = getDefaultInstance().getHead(); - onChanged(); - return this; - } - /** - * optional string head = 4; - */ - public Builder setHeadBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; - head_ = value; + head_ = 0; onChanged(); return this; } @@ -45552,9 +45402,9 @@ public final class CommonProto { */ int getIsGive(); - // optional string head = 12; + // optional int32 head = 12; /** - * optional string head = 12; + * optional int32 head = 12; * *
      * 新头像
@@ -45562,22 +45412,13 @@ public final class CommonProto {
      */
     boolean hasHead();
     /**
-     * optional string head = 12;
+     * optional int32 head = 12;
      *
      * 
      * 新头像
      * 
*/ - java.lang.String getHead(); - /** - * optional string head = 12; - * - *
-     * 新头像
-     * 
- */ - com.google.protobuf.ByteString - getHeadBytes(); + int getHead(); // optional int32 frame = 13; /** @@ -45696,9 +45537,9 @@ public final class CommonProto { isGive_ = input.readInt32(); break; } - case 98: { + case 96: { bitField0_ |= 0x00000040; - head_ = input.readBytes(); + head_ = input.readInt32(); break; } case 104: { @@ -45926,11 +45767,11 @@ public final class CommonProto { return isGive_; } - // optional string head = 12; + // optional int32 head = 12; public static final int HEAD_FIELD_NUMBER = 12; - private java.lang.Object head_; + private int head_; /** - * optional string head = 12; + * optional int32 head = 12; * *
      * 新头像
@@ -45940,45 +45781,14 @@ public final class CommonProto {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
     /**
-     * optional string head = 12;
+     * optional int32 head = 12;
      *
      * 
      * 新头像
      * 
*/ - public java.lang.String getHead() { - java.lang.Object ref = head_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - head_ = s; - } - return s; - } - } - /** - * optional string head = 12; - * - *
-     * 新头像
-     * 
- */ - public com.google.protobuf.ByteString - getHeadBytes() { - java.lang.Object ref = head_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - head_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public int getHead() { + return head_; } // optional int32 frame = 13; @@ -46036,7 +45846,7 @@ public final class CommonProto { offLineTime_ = 0L; haveReward_ = 0; isGive_ = 0; - head_ = ""; + head_ = 0; frame_ = 0; soulVal_ = 0; } @@ -46071,7 +45881,7 @@ public final class CommonProto { output.writeInt32(6, isGive_); } if (((bitField0_ & 0x00000040) == 0x00000040)) { - output.writeBytes(12, getHeadBytes()); + output.writeInt32(12, head_); } if (((bitField0_ & 0x00000080) == 0x00000080)) { output.writeInt32(13, frame_); @@ -46114,7 +45924,7 @@ public final class CommonProto { } if (((bitField0_ & 0x00000040) == 0x00000040)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(12, getHeadBytes()); + .computeInt32Size(12, head_); } if (((bitField0_ & 0x00000080) == 0x00000080)) { size += com.google.protobuf.CodedOutputStream @@ -46252,7 +46062,7 @@ public final class CommonProto { bitField0_ = (bitField0_ & ~0x00000010); isGive_ = 0; bitField0_ = (bitField0_ & ~0x00000020); - head_ = ""; + head_ = 0; bitField0_ = (bitField0_ & ~0x00000040); frame_ = 0; bitField0_ = (bitField0_ & ~0x00000080); @@ -46359,9 +46169,7 @@ public final class CommonProto { setIsGive(other.getIsGive()); } if (other.hasHead()) { - bitField0_ |= 0x00000040; - head_ = other.head_; - onChanged(); + setHead(other.getHead()); } if (other.hasFrame()) { setFrame(other.getFrame()); @@ -46739,10 +46547,10 @@ public final class CommonProto { return this; } - // optional string head = 12; - private java.lang.Object head_ = ""; + // optional int32 head = 12; + private int head_ ; /** - * optional string head = 12; + * optional int32 head = 12; * *
        * 新头像
@@ -46752,62 +46560,30 @@ public final class CommonProto {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * optional string head = 12;
+       * optional int32 head = 12;
        *
        * 
        * 新头像
        * 
*/ - public java.lang.String getHead() { - java.lang.Object ref = head_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - head_ = s; - return s; - } else { - return (java.lang.String) ref; - } + public int getHead() { + return head_; } /** - * optional string head = 12; + * optional int32 head = 12; * *
        * 新头像
        * 
*/ - public com.google.protobuf.ByteString - getHeadBytes() { - java.lang.Object ref = head_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - head_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string head = 12; - * - *
-       * 新头像
-       * 
- */ - public Builder setHead( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000040; + public Builder setHead(int value) { + bitField0_ |= 0x00000040; head_ = value; onChanged(); return this; } /** - * optional string head = 12; + * optional int32 head = 12; * *
        * 新头像
@@ -46815,24 +46591,7 @@ public final class CommonProto {
        */
       public Builder clearHead() {
         bitField0_ = (bitField0_ & ~0x00000040);
-        head_ = getDefaultInstance().getHead();
-        onChanged();
-        return this;
-      }
-      /**
-       * optional string head = 12;
-       *
-       * 
-       * 新头像
-       * 
- */ - public Builder setHeadBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000040; - head_ = value; + head_ = 0; onChanged(); return this; } @@ -68405,22 +68164,747 @@ public final class CommonProto { // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.SignInInfo) } + public interface TeamSimpleInfoOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional string heroid = 1; + /** + * optional string heroid = 1; + */ + boolean hasHeroid(); + /** + * optional string heroid = 1; + */ + java.lang.String getHeroid(); + /** + * optional string heroid = 1; + */ + com.google.protobuf.ByteString + getHeroidBytes(); + + // optional int32 heroTid = 2; + /** + * optional int32 heroTid = 2; + */ + boolean hasHeroTid(); + /** + * optional int32 heroTid = 2; + */ + int getHeroTid(); + + // optional int32 star = 3; + /** + * optional int32 star = 3; + */ + boolean hasStar(); + /** + * optional int32 star = 3; + */ + int getStar(); + + // optional int32 level = 4; + /** + * optional int32 level = 4; + */ + boolean hasLevel(); + /** + * optional int32 level = 4; + */ + int getLevel(); + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.TeamSimpleInfo} + */ + public static final class TeamSimpleInfo extends + com.google.protobuf.GeneratedMessage + implements TeamSimpleInfoOrBuilder { + // Use TeamSimpleInfo.newBuilder() to construct. + private TeamSimpleInfo(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private TeamSimpleInfo(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final TeamSimpleInfo defaultInstance; + public static TeamSimpleInfo getDefaultInstance() { + return defaultInstance; + } + + public TeamSimpleInfo getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private TeamSimpleInfo( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + bitField0_ |= 0x00000001; + heroid_ = input.readBytes(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + heroTid_ = input.readInt32(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + star_ = input.readInt32(); + break; + } + case 32: { + bitField0_ |= 0x00000008; + level_ = input.readInt32(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_TeamSimpleInfo_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_TeamSimpleInfo_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.class, com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public TeamSimpleInfo parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new TeamSimpleInfo(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional string heroid = 1; + public static final int HEROID_FIELD_NUMBER = 1; + private java.lang.Object heroid_; + /** + * optional string heroid = 1; + */ + public boolean hasHeroid() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional string heroid = 1; + */ + public java.lang.String getHeroid() { + java.lang.Object ref = heroid_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + heroid_ = s; + } + return s; + } + } + /** + * optional string heroid = 1; + */ + public com.google.protobuf.ByteString + getHeroidBytes() { + java.lang.Object ref = heroid_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + heroid_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + // optional int32 heroTid = 2; + public static final int HEROTID_FIELD_NUMBER = 2; + private int heroTid_; + /** + * optional int32 heroTid = 2; + */ + public boolean hasHeroTid() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 heroTid = 2; + */ + public int getHeroTid() { + return heroTid_; + } + + // optional int32 star = 3; + public static final int STAR_FIELD_NUMBER = 3; + private int star_; + /** + * optional int32 star = 3; + */ + public boolean hasStar() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 star = 3; + */ + public int getStar() { + return star_; + } + + // optional int32 level = 4; + public static final int LEVEL_FIELD_NUMBER = 4; + private int level_; + /** + * optional int32 level = 4; + */ + public boolean hasLevel() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional int32 level = 4; + */ + public int getLevel() { + return level_; + } + + private void initFields() { + heroid_ = ""; + heroTid_ = 0; + star_ = 0; + level_ = 0; + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeBytes(1, getHeroidBytes()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(2, heroTid_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeInt32(3, star_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeInt32(4, level_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, getHeroidBytes()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, heroTid_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, star_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(4, level_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.TeamSimpleInfo} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfoOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_TeamSimpleInfo_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_TeamSimpleInfo_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.class, com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.Builder.class); + } + + // Construct using com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + heroid_ = ""; + bitField0_ = (bitField0_ & ~0x00000001); + heroTid_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + star_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); + level_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_TeamSimpleInfo_descriptor; + } + + public com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.getDefaultInstance(); + } + + public com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo build() { + com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo buildPartial() { + com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo result = new com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.heroid_ = heroid_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.heroTid_ = heroTid_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.star_ = star_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + result.level_ = level_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo) { + return mergeFrom((com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo other) { + if (other == com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.getDefaultInstance()) return this; + if (other.hasHeroid()) { + bitField0_ |= 0x00000001; + heroid_ = other.heroid_; + onChanged(); + } + if (other.hasHeroTid()) { + setHeroTid(other.getHeroTid()); + } + if (other.hasStar()) { + setStar(other.getStar()); + } + if (other.hasLevel()) { + setLevel(other.getLevel()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional string heroid = 1; + private java.lang.Object heroid_ = ""; + /** + * optional string heroid = 1; + */ + public boolean hasHeroid() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional string heroid = 1; + */ + public java.lang.String getHeroid() { + java.lang.Object ref = heroid_; + if (!(ref instanceof java.lang.String)) { + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + heroid_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string heroid = 1; + */ + public com.google.protobuf.ByteString + getHeroidBytes() { + java.lang.Object ref = heroid_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + heroid_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string heroid = 1; + */ + public Builder setHeroid( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + heroid_ = value; + onChanged(); + return this; + } + /** + * optional string heroid = 1; + */ + public Builder clearHeroid() { + bitField0_ = (bitField0_ & ~0x00000001); + heroid_ = getDefaultInstance().getHeroid(); + onChanged(); + return this; + } + /** + * optional string heroid = 1; + */ + public Builder setHeroidBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + heroid_ = value; + onChanged(); + return this; + } + + // optional int32 heroTid = 2; + private int heroTid_ ; + /** + * optional int32 heroTid = 2; + */ + public boolean hasHeroTid() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 heroTid = 2; + */ + public int getHeroTid() { + return heroTid_; + } + /** + * optional int32 heroTid = 2; + */ + public Builder setHeroTid(int value) { + bitField0_ |= 0x00000002; + heroTid_ = value; + onChanged(); + return this; + } + /** + * optional int32 heroTid = 2; + */ + public Builder clearHeroTid() { + bitField0_ = (bitField0_ & ~0x00000002); + heroTid_ = 0; + onChanged(); + return this; + } + + // optional int32 star = 3; + private int star_ ; + /** + * optional int32 star = 3; + */ + public boolean hasStar() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 star = 3; + */ + public int getStar() { + return star_; + } + /** + * optional int32 star = 3; + */ + public Builder setStar(int value) { + bitField0_ |= 0x00000004; + star_ = value; + onChanged(); + return this; + } + /** + * optional int32 star = 3; + */ + public Builder clearStar() { + bitField0_ = (bitField0_ & ~0x00000004); + star_ = 0; + onChanged(); + return this; + } + + // optional int32 level = 4; + private int level_ ; + /** + * optional int32 level = 4; + */ + public boolean hasLevel() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional int32 level = 4; + */ + public int getLevel() { + return level_; + } + /** + * optional int32 level = 4; + */ + public Builder setLevel(int value) { + bitField0_ |= 0x00000008; + level_ = value; + onChanged(); + return this; + } + /** + * optional int32 level = 4; + */ + public Builder clearLevel() { + bitField0_ = (bitField0_ & ~0x00000008); + level_ = 0; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.TeamSimpleInfo) + } + + static { + defaultInstance = new TeamSimpleInfo(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.TeamSimpleInfo) + } + public interface TeamOneTeamInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { - // optional .com.ljsd.jieling.protocols.Team team = 1; + // repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; /** - * optional .com.ljsd.jieling.protocols.Team team = 1; + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; */ - boolean hasTeam(); + java.util.List + getTeamList(); /** - * optional .com.ljsd.jieling.protocols.Team team = 1; + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; */ - com.ljsd.jieling.protocols.CommonProto.Team getTeam(); + com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo getTeam(int index); /** - * optional .com.ljsd.jieling.protocols.Team team = 1; + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; */ - com.ljsd.jieling.protocols.CommonProto.TeamOrBuilder getTeamOrBuilder(); + int getTeamCount(); + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + java.util.List + getTeamOrBuilderList(); + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfoOrBuilder getTeamOrBuilder( + int index); // repeated int32 PokemonInfos = 2; /** @@ -68524,16 +69008,11 @@ public final class CommonProto { break; } case 10: { - com.ljsd.jieling.protocols.CommonProto.Team.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = team_.toBuilder(); + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + team_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } - team_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.Team.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(team_); - team_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; + team_.add(input.readMessage(com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.PARSER, extensionRegistry)); break; } case 16: { @@ -68558,7 +69037,7 @@ public final class CommonProto { break; } case 24: { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; totalForce_ = input.readInt32(); break; } @@ -68591,6 +69070,9 @@ public final class CommonProto { throw new com.google.protobuf.InvalidProtocolBufferException( e.getMessage()).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + team_ = java.util.Collections.unmodifiableList(team_); + } if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { pokemonInfos_ = java.util.Collections.unmodifiableList(pokemonInfos_); } @@ -68629,27 +69111,41 @@ public final class CommonProto { } private int bitField0_; - // optional .com.ljsd.jieling.protocols.Team team = 1; + // repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; public static final int TEAM_FIELD_NUMBER = 1; - private com.ljsd.jieling.protocols.CommonProto.Team team_; + private java.util.List team_; /** - * optional .com.ljsd.jieling.protocols.Team team = 1; + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; */ - public boolean hasTeam() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .com.ljsd.jieling.protocols.Team team = 1; - */ - public com.ljsd.jieling.protocols.CommonProto.Team getTeam() { + public java.util.List getTeamList() { return team_; } /** - * optional .com.ljsd.jieling.protocols.Team team = 1; + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; */ - public com.ljsd.jieling.protocols.CommonProto.TeamOrBuilder getTeamOrBuilder() { + public java.util.List + getTeamOrBuilderList() { return team_; } + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + public int getTeamCount() { + return team_.size(); + } + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo getTeam(int index) { + return team_.get(index); + } + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfoOrBuilder getTeamOrBuilder( + int index) { + return team_.get(index); + } // repeated int32 PokemonInfos = 2; public static final int POKEMONINFOS_FIELD_NUMBER = 2; @@ -68681,7 +69177,7 @@ public final class CommonProto { * optional int32 totalForce = 3; */ public boolean hasTotalForce() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000001) == 0x00000001); } /** * optional int32 totalForce = 3; @@ -68726,7 +69222,7 @@ public final class CommonProto { } private void initFields() { - team_ = com.ljsd.jieling.protocols.CommonProto.Team.getDefaultInstance(); + team_ = java.util.Collections.emptyList(); pokemonInfos_ = java.util.Collections.emptyList(); totalForce_ = 0; remainHp_ = java.util.Collections.emptyList(); @@ -68743,13 +69239,13 @@ public final class CommonProto { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, team_); + for (int i = 0; i < team_.size(); i++) { + output.writeMessage(1, team_.get(i)); } for (int i = 0; i < pokemonInfos_.size(); i++) { output.writeInt32(2, pokemonInfos_.get(i)); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeInt32(3, totalForce_); } for (int i = 0; i < remainHp_.size(); i++) { @@ -68764,9 +69260,9 @@ public final class CommonProto { if (size != -1) return size; size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + for (int i = 0; i < team_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, team_); + .computeMessageSize(1, team_.get(i)); } { int dataSize = 0; @@ -68777,7 +69273,7 @@ public final class CommonProto { size += dataSize; size += 1 * getPokemonInfosList().size(); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(3, totalForce_); } @@ -68908,11 +69404,11 @@ public final class CommonProto { public Builder clear() { super.clear(); if (teamBuilder_ == null) { - team_ = com.ljsd.jieling.protocols.CommonProto.Team.getDefaultInstance(); + team_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); } else { teamBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); pokemonInfos_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000002); totalForce_ = 0; @@ -68947,10 +69443,11 @@ public final class CommonProto { com.ljsd.jieling.protocols.CommonProto.TeamOneTeamInfo result = new com.ljsd.jieling.protocols.CommonProto.TeamOneTeamInfo(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } if (teamBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { + team_ = java.util.Collections.unmodifiableList(team_); + bitField0_ = (bitField0_ & ~0x00000001); + } result.team_ = team_; } else { result.team_ = teamBuilder_.build(); @@ -68961,7 +69458,7 @@ public final class CommonProto { } result.pokemonInfos_ = pokemonInfos_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000002; + to_bitField0_ |= 0x00000001; } result.totalForce_ = totalForce_; if (((bitField0_ & 0x00000008) == 0x00000008)) { @@ -68985,8 +69482,31 @@ public final class CommonProto { public Builder mergeFrom(com.ljsd.jieling.protocols.CommonProto.TeamOneTeamInfo other) { if (other == com.ljsd.jieling.protocols.CommonProto.TeamOneTeamInfo.getDefaultInstance()) return this; - if (other.hasTeam()) { - mergeTeam(other.getTeam()); + if (teamBuilder_ == null) { + if (!other.team_.isEmpty()) { + if (team_.isEmpty()) { + team_ = other.team_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureTeamIsMutable(); + team_.addAll(other.team_); + } + onChanged(); + } + } else { + if (!other.team_.isEmpty()) { + if (teamBuilder_.isEmpty()) { + teamBuilder_.dispose(); + teamBuilder_ = null; + team_ = other.team_; + bitField0_ = (bitField0_ & ~0x00000001); + teamBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getTeamFieldBuilder() : null; + } else { + teamBuilder_.addAllMessages(other.team_); + } + } } if (!other.pokemonInfos_.isEmpty()) { if (pokemonInfos_.isEmpty()) { @@ -69038,116 +69558,239 @@ public final class CommonProto { } private int bitField0_; - // optional .com.ljsd.jieling.protocols.Team team = 1; - private com.ljsd.jieling.protocols.CommonProto.Team team_ = com.ljsd.jieling.protocols.CommonProto.Team.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - com.ljsd.jieling.protocols.CommonProto.Team, com.ljsd.jieling.protocols.CommonProto.Team.Builder, com.ljsd.jieling.protocols.CommonProto.TeamOrBuilder> teamBuilder_; - /** - * optional .com.ljsd.jieling.protocols.Team team = 1; - */ - public boolean hasTeam() { - return ((bitField0_ & 0x00000001) == 0x00000001); + // repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + private java.util.List team_ = + java.util.Collections.emptyList(); + private void ensureTeamIsMutable() { + if (!((bitField0_ & 0x00000001) == 0x00000001)) { + team_ = new java.util.ArrayList(team_); + bitField0_ |= 0x00000001; + } } + + private com.google.protobuf.RepeatedFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo, com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.Builder, com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfoOrBuilder> teamBuilder_; + /** - * optional .com.ljsd.jieling.protocols.Team team = 1; + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; */ - public com.ljsd.jieling.protocols.CommonProto.Team getTeam() { + public java.util.List getTeamList() { if (teamBuilder_ == null) { - return team_; + return java.util.Collections.unmodifiableList(team_); } else { - return teamBuilder_.getMessage(); + return teamBuilder_.getMessageList(); } } /** - * optional .com.ljsd.jieling.protocols.Team team = 1; + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; */ - public Builder setTeam(com.ljsd.jieling.protocols.CommonProto.Team value) { + public int getTeamCount() { + if (teamBuilder_ == null) { + return team_.size(); + } else { + return teamBuilder_.getCount(); + } + } + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo getTeam(int index) { + if (teamBuilder_ == null) { + return team_.get(index); + } else { + return teamBuilder_.getMessage(index); + } + } + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + public Builder setTeam( + int index, com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo value) { if (teamBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - team_ = value; + ensureTeamIsMutable(); + team_.set(index, value); onChanged(); } else { - teamBuilder_.setMessage(value); + teamBuilder_.setMessage(index, value); } - bitField0_ |= 0x00000001; return this; } /** - * optional .com.ljsd.jieling.protocols.Team team = 1; + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; */ public Builder setTeam( - com.ljsd.jieling.protocols.CommonProto.Team.Builder builderForValue) { + int index, com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.Builder builderForValue) { if (teamBuilder_ == null) { - team_ = builderForValue.build(); + ensureTeamIsMutable(); + team_.set(index, builderForValue.build()); onChanged(); } else { - teamBuilder_.setMessage(builderForValue.build()); + teamBuilder_.setMessage(index, builderForValue.build()); } - bitField0_ |= 0x00000001; return this; } /** - * optional .com.ljsd.jieling.protocols.Team team = 1; + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; */ - public Builder mergeTeam(com.ljsd.jieling.protocols.CommonProto.Team value) { + public Builder addTeam(com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo value) { if (teamBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001) && - team_ != com.ljsd.jieling.protocols.CommonProto.Team.getDefaultInstance()) { - team_ = - com.ljsd.jieling.protocols.CommonProto.Team.newBuilder(team_).mergeFrom(value).buildPartial(); - } else { - team_ = value; + if (value == null) { + throw new NullPointerException(); } + ensureTeamIsMutable(); + team_.add(value); onChanged(); } else { - teamBuilder_.mergeFrom(value); + teamBuilder_.addMessage(value); } - bitField0_ |= 0x00000001; return this; } /** - * optional .com.ljsd.jieling.protocols.Team team = 1; + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + public Builder addTeam( + int index, com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo value) { + if (teamBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTeamIsMutable(); + team_.add(index, value); + onChanged(); + } else { + teamBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + public Builder addTeam( + com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.Builder builderForValue) { + if (teamBuilder_ == null) { + ensureTeamIsMutable(); + team_.add(builderForValue.build()); + onChanged(); + } else { + teamBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + public Builder addTeam( + int index, com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.Builder builderForValue) { + if (teamBuilder_ == null) { + ensureTeamIsMutable(); + team_.add(index, builderForValue.build()); + onChanged(); + } else { + teamBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + public Builder addAllTeam( + java.lang.Iterable values) { + if (teamBuilder_ == null) { + ensureTeamIsMutable(); + super.addAll(values, team_); + onChanged(); + } else { + teamBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; */ public Builder clearTeam() { if (teamBuilder_ == null) { - team_ = com.ljsd.jieling.protocols.CommonProto.Team.getDefaultInstance(); + team_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { teamBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); return this; } /** - * optional .com.ljsd.jieling.protocols.Team team = 1; + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; */ - public com.ljsd.jieling.protocols.CommonProto.Team.Builder getTeamBuilder() { - bitField0_ |= 0x00000001; - onChanged(); - return getTeamFieldBuilder().getBuilder(); + public Builder removeTeam(int index) { + if (teamBuilder_ == null) { + ensureTeamIsMutable(); + team_.remove(index); + onChanged(); + } else { + teamBuilder_.remove(index); + } + return this; } /** - * optional .com.ljsd.jieling.protocols.Team team = 1; + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; */ - public com.ljsd.jieling.protocols.CommonProto.TeamOrBuilder getTeamOrBuilder() { - if (teamBuilder_ != null) { - return teamBuilder_.getMessageOrBuilder(); - } else { - return team_; + public com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.Builder getTeamBuilder( + int index) { + return getTeamFieldBuilder().getBuilder(index); + } + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfoOrBuilder getTeamOrBuilder( + int index) { + if (teamBuilder_ == null) { + return team_.get(index); } else { + return teamBuilder_.getMessageOrBuilder(index); } } /** - * optional .com.ljsd.jieling.protocols.Team team = 1; + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; */ - private com.google.protobuf.SingleFieldBuilder< - com.ljsd.jieling.protocols.CommonProto.Team, com.ljsd.jieling.protocols.CommonProto.Team.Builder, com.ljsd.jieling.protocols.CommonProto.TeamOrBuilder> + public java.util.List + getTeamOrBuilderList() { + if (teamBuilder_ != null) { + return teamBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(team_); + } + } + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.Builder addTeamBuilder() { + return getTeamFieldBuilder().addBuilder( + com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.getDefaultInstance()); + } + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.Builder addTeamBuilder( + int index) { + return getTeamFieldBuilder().addBuilder( + index, com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.getDefaultInstance()); + } + /** + * repeated .com.ljsd.jieling.protocols.TeamSimpleInfo team = 1; + */ + public java.util.List + getTeamBuilderList() { + return getTeamFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo, com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.Builder, com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfoOrBuilder> getTeamFieldBuilder() { if (teamBuilder_ == null) { - teamBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.ljsd.jieling.protocols.CommonProto.Team, com.ljsd.jieling.protocols.CommonProto.Team.Builder, com.ljsd.jieling.protocols.CommonProto.TeamOrBuilder>( + teamBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo, com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfo.Builder, com.ljsd.jieling.protocols.CommonProto.TeamSimpleInfoOrBuilder>( team_, + ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), isClean()); team_ = null; @@ -74986,20 +75629,15 @@ public final class CommonProto { */ int getHeadFrame(); - // optional string head = 4; + // optional int32 head = 4; /** - * optional string head = 4; + * optional int32 head = 4; */ boolean hasHead(); /** - * optional string head = 4; + * optional int32 head = 4; */ - java.lang.String getHead(); - /** - * optional string head = 4; - */ - com.google.protobuf.ByteString - getHeadBytes(); + int getHead(); // optional int32 serverId = 5; /** @@ -75111,9 +75749,9 @@ public final class CommonProto { headFrame_ = input.readInt32(); break; } - case 34: { + case 32: { bitField0_ |= 0x00000008; - head_ = input.readBytes(); + head_ = input.readInt32(); break; } case 40: { @@ -75251,47 +75889,20 @@ public final class CommonProto { return headFrame_; } - // optional string head = 4; + // optional int32 head = 4; public static final int HEAD_FIELD_NUMBER = 4; - private java.lang.Object head_; + private int head_; /** - * optional string head = 4; + * optional int32 head = 4; */ public boolean hasHead() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional string head = 4; + * optional int32 head = 4; */ - public java.lang.String getHead() { - java.lang.Object ref = head_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - head_ = s; - } - return s; - } - } - /** - * optional string head = 4; - */ - public com.google.protobuf.ByteString - getHeadBytes() { - java.lang.Object ref = head_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - head_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public int getHead() { + return head_; } // optional int32 serverId = 5; @@ -75362,7 +75973,7 @@ public final class CommonProto { id_ = 0; name_ = ""; headFrame_ = 0; - head_ = ""; + head_ = 0; serverId_ = 0; level_ = 0; rank_ = 0; @@ -75390,7 +76001,7 @@ public final class CommonProto { output.writeInt32(3, headFrame_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeBytes(4, getHeadBytes()); + output.writeInt32(4, head_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { output.writeInt32(5, serverId_); @@ -75427,7 +76038,7 @@ public final class CommonProto { } if (((bitField0_ & 0x00000008) == 0x00000008)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(4, getHeadBytes()); + .computeInt32Size(4, head_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { size += com.google.protobuf.CodedOutputStream @@ -75571,7 +76182,7 @@ public final class CommonProto { bitField0_ = (bitField0_ & ~0x00000002); headFrame_ = 0; bitField0_ = (bitField0_ & ~0x00000004); - head_ = ""; + head_ = 0; bitField0_ = (bitField0_ & ~0x00000008); serverId_ = 0; bitField0_ = (bitField0_ & ~0x00000010); @@ -75669,9 +76280,7 @@ public final class CommonProto { setHeadFrame(other.getHeadFrame()); } if (other.hasHead()) { - bitField0_ |= 0x00000008; - head_ = other.head_; - onChanged(); + setHead(other.getHead()); } if (other.hasServerId()) { setServerId(other.getServerId()); @@ -75852,76 +76461,35 @@ public final class CommonProto { return this; } - // optional string head = 4; - private java.lang.Object head_ = ""; + // optional int32 head = 4; + private int head_ ; /** - * optional string head = 4; + * optional int32 head = 4; */ public boolean hasHead() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional string head = 4; + * optional int32 head = 4; */ - public java.lang.String getHead() { - java.lang.Object ref = head_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - head_ = s; - return s; - } else { - return (java.lang.String) ref; - } + public int getHead() { + return head_; } /** - * optional string head = 4; + * optional int32 head = 4; */ - public com.google.protobuf.ByteString - getHeadBytes() { - java.lang.Object ref = head_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - head_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string head = 4; - */ - public Builder setHead( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; + public Builder setHead(int value) { + bitField0_ |= 0x00000008; head_ = value; onChanged(); return this; } /** - * optional string head = 4; + * optional int32 head = 4; */ public Builder clearHead() { bitField0_ = (bitField0_ & ~0x00000008); - head_ = getDefaultInstance().getHead(); - onChanged(); - return this; - } - /** - * optional string head = 4; - */ - public Builder setHeadBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; - head_ = value; + head_ = 0; onChanged(); return this; } @@ -78926,6 +79494,11 @@ public final class CommonProto { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_com_ljsd_jieling_protocols_SignInInfo_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_com_ljsd_jieling_protocols_TeamSimpleInfo_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_com_ljsd_jieling_protocols_TeamSimpleInfo_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor internal_static_com_ljsd_jieling_protocols_TeamOneTeamInfo_descriptor; private static @@ -79005,7 +79578,7 @@ public final class CommonProto { "\005\022\016\n\006errMsg\030\002 \001(\t\"\356\002\n\006Player\022\013\n\003uid\030\001 \001(" + "\005\022\020\n\010nickName\030\002 \001(\t\022\r\n\005level\030\003 \001(\005\022\013\n\003ex" + "p\030\004 \001(\005\022\020\n\010vipLevel\030\005 \001(\005\022\020\n\010familyId\030\006 " + - "\001(\005\022\014\n\004head\030\007 \001(\t\022\020\n\010curMapId\030\010 \001(\005\022\016\n\006e" + + "\001(\005\022\014\n\004head\030\007 \001(\005\022\020\n\010curMapId\030\010 \001(\005\022\016\n\006e" + "nergy\030\t \001(\005\022\034\n\024lastUpdateEnergyTime\030\n \001(" + "\005\022\022\n\nserverTime\030\013 \001(\005\022\020\n\010maxForce\030\014 \001(\005\022" + "\017\n\007saveAmt\030\r \001(\005\022\024\n\014rechargeTime\030\016 \001(\005\022\027" + @@ -79125,7 +79698,7 @@ public final class CommonProto { "Time\030\002 \001(\005\022\017\n\007endTime\030\003 \001(\005\022\020\n\010interval\030" + "\004 \001(\005\"q\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\004hea" + - "d\030\004 \001(\t\022\014\n\004rank\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005" + + "d\030\004 \001(\005\022\014\n\004rank\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005" + "\"\314\001\n\021AdventureBossInfo\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\006bo" + "ssId\030\004 \001(\t\022\023\n\013bossGroupId\030\005 \001(\005\022\016\n\006myHur" + @@ -79138,7 +79711,7 @@ public final class CommonProto { "Box\030\002 \001(\005\022\027\n\017hadTakeDailyBox\030\003 \001(\005\"\225\001\n\006F" + "riend\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\014\n\004head\030\014 \001(\t\022\r\n\005fr" + + " \001(\005\022\016\n\006isGive\030\006 \001(\005\022\014\n\004head\030\014 \001(\005\022\r\n\005fr" + "ame\030\r \001(\005\022\017\n\007soulVal\030\016 \001(\005\"V\n\rGiftGoodsI", "nfo\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\021Go" + @@ -79200,38 +79773,40 @@ public final class CommonProto { "\030\004 \001(\005\"g\n\nExpertInfo\022\014\n\004name\030\001 \001(\t\022\r\n\005sc" + "ore\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\nSignI", - "nInfo\022\014\n\004days\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\"}\n\017Te" + - "amOneTeamInfo\022.\n\004team\030\001 \001(\0132 .com.ljsd.j" + - "ieling.protocols.Team\022\024\n\014PokemonInfos\030\002 " + - "\003(\005\022\022\n\ntotalForce\030\003 \001(\005\022\020\n\010remainHp\030\004 \003(" + - "\005\"\223\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\thea" + - "dFrame\030\005 \001(\005\0229\n\004team\030\006 \001(\0132+.com.ljsd.ji" + - "eling.protocols.TeamOneTeamInfo\"l\n\017Monst" + - "erRankInfo\022\014\n\004name\030\001 \001(\t\022\r\n\005score\030\002 \001(\005\022" + - "\014\n\004rank\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\022\014\n\004head\030\005 \001", - "(\005\022\021\n\theadFrame\030\006 \001(\005\"2\n\rHeroBloodInfo\022\016" + - "\n\006heroId\030\001 \001(\t\022\021\n\tlostBlood\030\002 \001(\005\"D\n\013End" + - "lessInfo\022\r\n\005mapId\030\001 \001(\005\022\022\n\nworldLevel\030\002 " + - "\001(\005\022\022\n\nbloodScore\030\003 \001(\005\"2\n\017PlayerBindPho" + - "ne\022\020\n\010phoneNum\030\001 \001(\t\022\r\n\005state\030\002 \001(\005\"3\n\014E" + - "ndlessPoint\022\020\n\010location\030\001 \001(\005\022\021\n\tmonster" + - "Id\030\002 \001(\005\"2\n\014StrongerInfo\022\020\n\010curScore\030\001 \001" + - "(\005\022\020\n\010maxScore\030\002 \001(\005\"U\n\017QuestionOptions\022" + - "\017\n\007content\030\001 \001(\t\022\014\n\004type\030\002 \001(\005\022\017\n\007option" + - "s\030\003 \003(\t\022\022\n\nanswerType\030\004 \001(\005\"\212\001\n\017BloodPer", - "sonInfo\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\021\n\thea" + - "dFrame\030\003 \001(\005\022\014\n\004head\030\004 \001(\t\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\005sco" + - "re\030\010 \001(\005\"H\n\026LuckWheelRewardPosInfo\022\013\n\003po" + - "s\030\001 \001(\005\022\016\n\006luckId\030\002 \001(\005\022\021\n\tluckTimes\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.protocols.User" + - "MissionInfo\"\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\007f" + - "ightId\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(\005B" + - "\002H\001" + "nInfo\022\014\n\004days\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\"N\n\016Te" + + "amSimpleInfo\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\"\207\001\n\017T" + + "eamOneTeamInfo\0228\n\004team\030\001 \003(\0132*.com.ljsd." + + "jieling.protocols.TeamSimpleInfo\022\024\n\014Poke" + + "monInfos\030\002 \003(\005\022\022\n\ntotalForce\030\003 \001(\005\022\020\n\010re" + + "mainHp\030\004 \003(\005\"\223\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\theadFrame\030\005 \001(\005\0229\n\004team\030\006 \001(\0132+." + + "com.ljsd.jieling.protocols.TeamOneTeamIn", + "fo\"l\n\017MonsterRankInfo\022\014\n\004name\030\001 \001(\t\022\r\n\005s" + + "core\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\"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\"W\n\013RefreshTask\022\014\n\004type\030\001 \001" + + "(\005\022:\n\005tasks\030\002 \003(\0132+.com.ljsd.jieling.pro" + + "tocols.UserMissionInfo\"\221\001\n\021MainLevelRank", + "Info\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\022\014\n\004name" + + "\030\003 \001(\t\022\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\theadF" + + "rame\030\010 \001(\005B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -79688,80 +80263,86 @@ public final class CommonProto { com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_SignInInfo_descriptor, new java.lang.String[] { "Days", "State", }); - internal_static_com_ljsd_jieling_protocols_TeamOneTeamInfo_descriptor = + internal_static_com_ljsd_jieling_protocols_TeamSimpleInfo_descriptor = getDescriptor().getMessageTypes().get(74); + internal_static_com_ljsd_jieling_protocols_TeamSimpleInfo_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_com_ljsd_jieling_protocols_TeamSimpleInfo_descriptor, + new java.lang.String[] { "Heroid", "HeroTid", "Star", "Level", }); + internal_static_com_ljsd_jieling_protocols_TeamOneTeamInfo_descriptor = + getDescriptor().getMessageTypes().get(75); internal_static_com_ljsd_jieling_protocols_TeamOneTeamInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_TeamOneTeamInfo_descriptor, new java.lang.String[] { "Team", "PokemonInfos", "TotalForce", "RemainHp", }); internal_static_com_ljsd_jieling_protocols_TeamOneInfo_descriptor = - getDescriptor().getMessageTypes().get(75); + getDescriptor().getMessageTypes().get(76); internal_static_com_ljsd_jieling_protocols_TeamOneInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_TeamOneInfo_descriptor, new java.lang.String[] { "Uid", "Level", "Name", "Head", "HeadFrame", "Team", }); internal_static_com_ljsd_jieling_protocols_MonsterRankInfo_descriptor = - getDescriptor().getMessageTypes().get(76); + getDescriptor().getMessageTypes().get(77); internal_static_com_ljsd_jieling_protocols_MonsterRankInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_MonsterRankInfo_descriptor, new java.lang.String[] { "Name", "Score", "Rank", "Level", "Head", "HeadFrame", }); internal_static_com_ljsd_jieling_protocols_HeroBloodInfo_descriptor = - getDescriptor().getMessageTypes().get(77); + getDescriptor().getMessageTypes().get(78); internal_static_com_ljsd_jieling_protocols_HeroBloodInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_HeroBloodInfo_descriptor, new java.lang.String[] { "HeroId", "LostBlood", }); internal_static_com_ljsd_jieling_protocols_EndlessInfo_descriptor = - getDescriptor().getMessageTypes().get(78); + getDescriptor().getMessageTypes().get(79); internal_static_com_ljsd_jieling_protocols_EndlessInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_EndlessInfo_descriptor, new java.lang.String[] { "MapId", "WorldLevel", "BloodScore", }); internal_static_com_ljsd_jieling_protocols_PlayerBindPhone_descriptor = - getDescriptor().getMessageTypes().get(79); + getDescriptor().getMessageTypes().get(80); internal_static_com_ljsd_jieling_protocols_PlayerBindPhone_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_PlayerBindPhone_descriptor, new java.lang.String[] { "PhoneNum", "State", }); internal_static_com_ljsd_jieling_protocols_EndlessPoint_descriptor = - getDescriptor().getMessageTypes().get(80); + getDescriptor().getMessageTypes().get(81); internal_static_com_ljsd_jieling_protocols_EndlessPoint_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_EndlessPoint_descriptor, new java.lang.String[] { "Location", "MonsterId", }); internal_static_com_ljsd_jieling_protocols_StrongerInfo_descriptor = - getDescriptor().getMessageTypes().get(81); + getDescriptor().getMessageTypes().get(82); internal_static_com_ljsd_jieling_protocols_StrongerInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_StrongerInfo_descriptor, new java.lang.String[] { "CurScore", "MaxScore", }); internal_static_com_ljsd_jieling_protocols_QuestionOptions_descriptor = - getDescriptor().getMessageTypes().get(82); + getDescriptor().getMessageTypes().get(83); internal_static_com_ljsd_jieling_protocols_QuestionOptions_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_QuestionOptions_descriptor, new java.lang.String[] { "Content", "Type", "Options", "AnswerType", }); internal_static_com_ljsd_jieling_protocols_BloodPersonInfo_descriptor = - getDescriptor().getMessageTypes().get(83); + getDescriptor().getMessageTypes().get(84); internal_static_com_ljsd_jieling_protocols_BloodPersonInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_BloodPersonInfo_descriptor, new java.lang.String[] { "Id", "Name", "HeadFrame", "Head", "ServerId", "Level", "Rank", "Score", }); internal_static_com_ljsd_jieling_protocols_LuckWheelRewardPosInfo_descriptor = - getDescriptor().getMessageTypes().get(84); + getDescriptor().getMessageTypes().get(85); internal_static_com_ljsd_jieling_protocols_LuckWheelRewardPosInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_LuckWheelRewardPosInfo_descriptor, new java.lang.String[] { "Pos", "LuckId", "LuckTimes", }); internal_static_com_ljsd_jieling_protocols_RefreshTask_descriptor = - getDescriptor().getMessageTypes().get(85); + getDescriptor().getMessageTypes().get(86); internal_static_com_ljsd_jieling_protocols_RefreshTask_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_RefreshTask_descriptor, new java.lang.String[] { "Type", "Tasks", }); internal_static_com_ljsd_jieling_protocols_MainLevelRankInfo_descriptor = - getDescriptor().getMessageTypes().get(86); + getDescriptor().getMessageTypes().get(87); internal_static_com_ljsd_jieling_protocols_MainLevelRankInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_MainLevelRankInfo_descriptor, 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 23c7b0240..a2371358d 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java @@ -164,9 +164,9 @@ public final class Family { */ int getSoulForce(); - // optional string head = 9; + // optional int32 head = 9; /** - * optional string head = 9; + * optional int32 head = 9; * *
      * 新头像
@@ -174,22 +174,13 @@ public final class Family {
      */
     boolean hasHead();
     /**
-     * optional string head = 9;
+     * optional int32 head = 9;
      *
      * 
      * 新头像
      * 
*/ - java.lang.String getHead(); - /** - * optional string head = 9; - * - *
-     * 新头像
-     * 
- */ - com.google.protobuf.ByteString - getHeadBytes(); + int getHead(); // optional int32 frame = 10; /** @@ -300,9 +291,9 @@ public final class Family { soulForce_ = input.readInt32(); break; } - case 74: { + case 72: { bitField0_ |= 0x00000100; - head_ = input.readBytes(); + head_ = input.readInt32(); break; } case 80: { @@ -573,11 +564,11 @@ public final class Family { return soulForce_; } - // optional string head = 9; + // optional int32 head = 9; public static final int HEAD_FIELD_NUMBER = 9; - private java.lang.Object head_; + private int head_; /** - * optional string head = 9; + * optional int32 head = 9; * *
      * 新头像
@@ -587,45 +578,14 @@ public final class Family {
       return ((bitField0_ & 0x00000100) == 0x00000100);
     }
     /**
-     * optional string head = 9;
+     * optional int32 head = 9;
      *
      * 
      * 新头像
      * 
*/ - public java.lang.String getHead() { - java.lang.Object ref = head_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - head_ = s; - } - return s; - } - } - /** - * optional string head = 9; - * - *
-     * 新头像
-     * 
- */ - public com.google.protobuf.ByteString - getHeadBytes() { - java.lang.Object ref = head_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - head_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public int getHead() { + return head_; } // optional int32 frame = 10; @@ -661,7 +621,7 @@ public final class Family { seconds_ = 0; contributeToday_ = 0; soulForce_ = 0; - head_ = ""; + head_ = 0; frame_ = 0; } private byte memoizedIsInitialized = -1; @@ -721,7 +681,7 @@ public final class Family { output.writeInt32(8, soulForce_); } if (((bitField0_ & 0x00000100) == 0x00000100)) { - output.writeBytes(9, getHeadBytes()); + output.writeInt32(9, head_); } if (((bitField0_ & 0x00000200) == 0x00000200)) { output.writeInt32(10, frame_); @@ -769,7 +729,7 @@ public final class Family { } if (((bitField0_ & 0x00000100) == 0x00000100)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(9, getHeadBytes()); + .computeInt32Size(9, head_); } if (((bitField0_ & 0x00000200) == 0x00000200)) { size += com.google.protobuf.CodedOutputStream @@ -907,7 +867,7 @@ public final class Family { bitField0_ = (bitField0_ & ~0x00000040); soulForce_ = 0; bitField0_ = (bitField0_ & ~0x00000080); - head_ = ""; + head_ = 0; bitField0_ = (bitField0_ & ~0x00000100); frame_ = 0; bitField0_ = (bitField0_ & ~0x00000200); @@ -1022,9 +982,7 @@ public final class Family { setSoulForce(other.getSoulForce()); } if (other.hasHead()) { - bitField0_ |= 0x00000100; - head_ = other.head_; - onChanged(); + setHead(other.getHead()); } if (other.hasFrame()) { setFrame(other.getFrame()); @@ -1517,10 +1475,10 @@ public final class Family { return this; } - // optional string head = 9; - private java.lang.Object head_ = ""; + // optional int32 head = 9; + private int head_ ; /** - * optional string head = 9; + * optional int32 head = 9; * *
        * 新头像
@@ -1530,62 +1488,30 @@ public final class Family {
         return ((bitField0_ & 0x00000100) == 0x00000100);
       }
       /**
-       * optional string head = 9;
+       * optional int32 head = 9;
        *
        * 
        * 新头像
        * 
*/ - public java.lang.String getHead() { - java.lang.Object ref = head_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - head_ = s; - return s; - } else { - return (java.lang.String) ref; - } + public int getHead() { + return head_; } /** - * optional string head = 9; + * optional int32 head = 9; * *
        * 新头像
        * 
*/ - public com.google.protobuf.ByteString - getHeadBytes() { - java.lang.Object ref = head_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - head_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string head = 9; - * - *
-       * 新头像
-       * 
- */ - public Builder setHead( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000100; + public Builder setHead(int value) { + bitField0_ |= 0x00000100; head_ = value; onChanged(); return this; } /** - * optional string head = 9; + * optional int32 head = 9; * *
        * 新头像
@@ -1593,24 +1519,7 @@ public final class Family {
        */
       public Builder clearHead() {
         bitField0_ = (bitField0_ & ~0x00000100);
-        head_ = getDefaultInstance().getHead();
-        onChanged();
-        return this;
-      }
-      /**
-       * optional string head = 9;
-       *
-       * 
-       * 新头像
-       * 
- */ - public Builder setHeadBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000100; - head_ = value; + head_ = 0; onChanged(); return this; } @@ -36264,7 +36173,7 @@ public final class Family { "serLevel\030\003 \002(\005\022\020\n\010position\030\004 \002(\005\022\022\n\ncont" + "ribute\030\005 \002(\005\022\017\n\007seconds\030\006 \001(\005\022\027\n\017contrib" + "uteToday\030\007 \001(\005\022\021\n\tsoulForce\030\010 \001(\005\022\014\n\004hea" + - "d\030\t \001(\t\022\r\n\005frame\030\n \001(\005\"9\n\rFamilyLogInfo\022" + + "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" + "\016\n\006curPos\030\002 \001(\005\022\013\n\003uid\030\003 \001(\005\022\014\n\004name\030\004 \001", diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/MapInfoProto.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/MapInfoProto.java index 9ed3d6f0a..e8518feb7 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/MapInfoProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/MapInfoProto.java @@ -17443,20 +17443,15 @@ public final class MapInfoProto { */ int getHeroIds(int index); - // optional string head = 4; + // optional int32 head = 4; /** - * optional string head = 4; + * optional int32 head = 4; */ boolean hasHead(); /** - * optional string head = 4; + * optional int32 head = 4; */ - java.lang.String getHead(); - /** - * optional string head = 4; - */ - com.google.protobuf.ByteString - getHeadBytes(); + int getHead(); // optional int32 level = 5; /** @@ -17599,9 +17594,9 @@ public final class MapInfoProto { input.popLimit(limit); break; } - case 34: { + case 32: { bitField0_ |= 0x00000004; - head_ = input.readBytes(); + head_ = input.readInt32(); break; } case 40: { @@ -17746,47 +17741,20 @@ public final class MapInfoProto { return heroIds_.get(index); } - // optional string head = 4; + // optional int32 head = 4; public static final int HEAD_FIELD_NUMBER = 4; - private java.lang.Object head_; + private int head_; /** - * optional string head = 4; + * optional int32 head = 4; */ public boolean hasHead() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional string head = 4; + * optional int32 head = 4; */ - public java.lang.String getHead() { - java.lang.Object ref = head_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - head_ = s; - } - return s; - } - } - /** - * optional string head = 4; - */ - public com.google.protobuf.ByteString - getHeadBytes() { - java.lang.Object ref = head_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - head_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public int getHead() { + return head_; } // optional int32 level = 5; @@ -17907,7 +17875,7 @@ public final class MapInfoProto { uid_ = 0; forces_ = 0; heroIds_ = java.util.Collections.emptyList(); - head_ = ""; + head_ = 0; level_ = 0; rank_ = 0; time_ = 0; @@ -17936,7 +17904,7 @@ public final class MapInfoProto { output.writeInt32(3, heroIds_.get(i)); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBytes(4, getHeadBytes()); + output.writeInt32(4, head_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { output.writeInt32(5, level_); @@ -17981,7 +17949,7 @@ public final class MapInfoProto { } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(4, getHeadBytes()); + .computeInt32Size(4, head_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { size += com.google.protobuf.CodedOutputStream @@ -18130,7 +18098,7 @@ public final class MapInfoProto { bitField0_ = (bitField0_ & ~0x00000002); heroIds_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000004); - head_ = ""; + head_ = 0; bitField0_ = (bitField0_ & ~0x00000008); level_ = 0; bitField0_ = (bitField0_ & ~0x00000010); @@ -18241,9 +18209,7 @@ public final class MapInfoProto { onChanged(); } if (other.hasHead()) { - bitField0_ |= 0x00000008; - head_ = other.head_; - onChanged(); + setHead(other.getHead()); } if (other.hasLevel()) { setLevel(other.getLevel()); @@ -18428,76 +18394,35 @@ public final class MapInfoProto { return this; } - // optional string head = 4; - private java.lang.Object head_ = ""; + // optional int32 head = 4; + private int head_ ; /** - * optional string head = 4; + * optional int32 head = 4; */ public boolean hasHead() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional string head = 4; + * optional int32 head = 4; */ - public java.lang.String getHead() { - java.lang.Object ref = head_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - head_ = s; - return s; - } else { - return (java.lang.String) ref; - } + public int getHead() { + return head_; } /** - * optional string head = 4; + * optional int32 head = 4; */ - public com.google.protobuf.ByteString - getHeadBytes() { - java.lang.Object ref = head_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - head_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string head = 4; - */ - public Builder setHead( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; + public Builder setHead(int value) { + bitField0_ |= 0x00000008; head_ = value; onChanged(); return this; } /** - * optional string head = 4; + * optional int32 head = 4; */ public Builder clearHead() { bitField0_ = (bitField0_ & ~0x00000008); - head_ = getDefaultInstance().getHead(); - onChanged(); - return this; - } - /** - * optional string head = 4; - */ - public Builder setHeadBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; - head_ = value; + head_ = 0; onChanged(); return this; } @@ -33368,7 +33293,7 @@ public final class MapInfoProto { "eling.protocols.DifficultMapOption\"&\n\025Ma" + "pGetRankInfoRequest\022\r\n\005mapId\030\001 \001(\005\"\226\001\n\013M" + "apRankInfo\022\013\n\003uid\030\001 \001(\005\022\016\n\006forces\030\002 \001(\005\022", - "\017\n\007heroIds\030\003 \003(\005\022\014\n\004head\030\004 \001(\t\022\r\n\005level\030" + + "\017\n\007heroIds\030\003 \003(\005\022\014\n\004head\030\004 \001(\005\022\r\n\005level\030" + "\005 \001(\005\022\014\n\004rank\030\006 \001(\005\022\014\n\004time\030\007 \001(\005\022\014\n\004nam" + "e\030\010 \001(\t\022\022\n\npokemonIds\030\t \003(\005\"V\n\026MapGetRan" + "kInfoResponse\022<\n\013mapRankInfo\030\001 \003(\0132\'.com" + diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/MessageTypeProto.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/MessageTypeProto.java index d388b32fc..240e05571 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/MessageTypeProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/MessageTypeProto.java @@ -1789,17 +1789,17 @@ public final class MessageTypeProto { */ MAP_TOWER_USEBUFF_RESPONSE(286, 11232), /** - * MODIFY_HEAD_FRAME_REQUEST = 11233; + * MODIFY_HEAD_REQUEST = 11233; * *
-     *修改头像框
+     *修改头或头像框
      * 
*/ - MODIFY_HEAD_FRAME_REQUEST(287, 11233), + MODIFY_HEAD_REQUEST(287, 11233), /** - * MODIFY_HEAD_FRAME_RESPONSE = 11234; + * MODIFY_HEAD_RESPONSE = 11234; */ - MODIFY_HEAD_FRAME_RESPONSE(288, 11234), + MODIFY_HEAD_RESPONSE(288, 11234), /** * MAP_OUT_INDICATION = 11235; * @@ -2701,6 +2701,18 @@ public final class MessageTypeProto { * VIP_TAKE_REWARD_RESPONSE = 12105; */ VIP_TAKE_REWARD_RESPONSE(429, 12105), + /** + * VIEW_HERO_INFO_REQUEST = 12106; + * + *
+     * 查看英雄详情信息
+     * 
+ */ + VIEW_HERO_INFO_REQUEST(430, 12106), + /** + * VIEW_HERO_INFO_RESPONSE = 12107; + */ + VIEW_HERO_INFO_RESPONSE(431, 12107), /** * WORKSHOP_FOUNDATION_REQUEST = 12200; * @@ -2708,11 +2720,11 @@ public final class MessageTypeProto { * W 12200 *
*/ - WORKSHOP_FOUNDATION_REQUEST(430, 12200), + WORKSHOP_FOUNDATION_REQUEST(432, 12200), /** * WORKSHOP_FOUNDATION_RESPONSE = 12201; */ - WORKSHOP_FOUNDATION_RESPONSE(431, 12201), + WORKSHOP_FOUNDATION_RESPONSE(433, 12201), /** * WORKSHOP_EQUIP_CREATE_REQUEST = 12202; * @@ -2720,11 +2732,11 @@ public final class MessageTypeProto { *装备打造 *
*/ - WORKSHOP_EQUIP_CREATE_REQUEST(432, 12202), + WORKSHOP_EQUIP_CREATE_REQUEST(434, 12202), /** * WORKSHOP_EQUIP_CREATE_RESPONSE = 12203; */ - WORKSHOP_EQUIP_CREATE_RESPONSE(433, 12203), + WORKSHOP_EQUIP_CREATE_RESPONSE(435, 12203), /** * WORKSHOP_REBUILD_REQUEST = 12204; * @@ -2732,11 +2744,11 @@ public final class MessageTypeProto { *装备重铸 *
*/ - WORKSHOP_REBUILD_REQUEST(434, 12204), + WORKSHOP_REBUILD_REQUEST(436, 12204), /** * WORKSHOP_REBUILD_RESPONSE = 12205; */ - WORKSHOP_REBUILD_RESPONSE(435, 12205), + WORKSHOP_REBUILD_RESPONSE(437, 12205), /** * WORKSHOP_REBUILD_CONFIRM_REQUEST = 12206; * @@ -2744,11 +2756,11 @@ public final class MessageTypeProto { * 重铸确认 *
*/ - WORKSHOP_REBUILD_CONFIRM_REQUEST(436, 12206), + WORKSHOP_REBUILD_CONFIRM_REQUEST(438, 12206), /** * WORKSHOP_REBUILD_CONFIRM_RESONSE = 12207; */ - WORKSHOP_REBUILD_CONFIRM_RESONSE(437, 12207), + WORKSHOP_REBUILD_CONFIRM_RESONSE(439, 12207), /** * WORKSHOP_LEVELUP_REQUEST = 12208; * @@ -2756,11 +2768,11 @@ public final class MessageTypeProto { *工坊升级 *
*/ - WORKSHOP_LEVELUP_REQUEST(438, 12208), + WORKSHOP_LEVELUP_REQUEST(440, 12208), /** * WORKSHOP_LEVELUP_RESPONSE = 12209; */ - WORKSHOP_LEVELUP_RESPONSE(439, 12209), + WORKSHOP_LEVELUP_RESPONSE(441, 12209), /** * WORKSHOP_TECHNOLOGY_LEVEL_REQUEST = 12210; * @@ -2768,11 +2780,11 @@ public final class MessageTypeProto { *科技树升级 *
*/ - WORKSHOP_TECHNOLOGY_LEVEL_REQUEST(440, 12210), + WORKSHOP_TECHNOLOGY_LEVEL_REQUEST(442, 12210), /** * WORKSHOP_TECHNOLOGY_RESPONSE = 12211; */ - WORKSHOP_TECHNOLOGY_RESPONSE(441, 12211), + WORKSHOP_TECHNOLOGY_RESPONSE(443, 12211), /** * WORKSHOP_TECHNOLOGY_RESET_REQUEST = 12212; * @@ -2780,11 +2792,11 @@ public final class MessageTypeProto { *科技树重置 *
*/ - WORKSHOP_TECHNOLOGY_RESET_REQUEST(442, 12212), + WORKSHOP_TECHNOLOGY_RESET_REQUEST(444, 12212), /** * WORKSHOP_TECHNOLOGY_RESET_RESPONSE = 12213; */ - WORKSHOP_TECHNOLOGY_RESET_RESPONSE(443, 12213), + WORKSHOP_TECHNOLOGY_RESET_RESPONSE(445, 12213), ; /** @@ -4563,17 +4575,17 @@ public final class MessageTypeProto { */ public static final int MAP_TOWER_USEBUFF_RESPONSE_VALUE = 11232; /** - * MODIFY_HEAD_FRAME_REQUEST = 11233; + * MODIFY_HEAD_REQUEST = 11233; * *
-     *修改头像框
+     *修改头或头像框
      * 
*/ - public static final int MODIFY_HEAD_FRAME_REQUEST_VALUE = 11233; + public static final int MODIFY_HEAD_REQUEST_VALUE = 11233; /** - * MODIFY_HEAD_FRAME_RESPONSE = 11234; + * MODIFY_HEAD_RESPONSE = 11234; */ - public static final int MODIFY_HEAD_FRAME_RESPONSE_VALUE = 11234; + public static final int MODIFY_HEAD_RESPONSE_VALUE = 11234; /** * MAP_OUT_INDICATION = 11235; * @@ -5475,6 +5487,18 @@ public final class MessageTypeProto { * VIP_TAKE_REWARD_RESPONSE = 12105; */ public static final int VIP_TAKE_REWARD_RESPONSE_VALUE = 12105; + /** + * VIEW_HERO_INFO_REQUEST = 12106; + * + *
+     * 查看英雄详情信息
+     * 
+ */ + public static final int VIEW_HERO_INFO_REQUEST_VALUE = 12106; + /** + * VIEW_HERO_INFO_RESPONSE = 12107; + */ + public static final int VIEW_HERO_INFO_RESPONSE_VALUE = 12107; /** * WORKSHOP_FOUNDATION_REQUEST = 12200; * @@ -5852,8 +5876,8 @@ public final class MessageTypeProto { case 11230: return MAP_TOWER_USEBOMB_RESPONSE; case 11231: return MAP_TOWER_USEBUFF_REQUEST; case 11232: return MAP_TOWER_USEBUFF_RESPONSE; - case 11233: return MODIFY_HEAD_FRAME_REQUEST; - case 11234: return MODIFY_HEAD_FRAME_RESPONSE; + case 11233: return MODIFY_HEAD_REQUEST; + case 11234: return MODIFY_HEAD_RESPONSE; case 11235: return MAP_OUT_INDICATION; case 11236: return MAIN_LEVEL_GET_INFO_REQUEST; case 11237: return MAIN_LEVEL_GET_INFO_RESPONSE; @@ -5995,6 +6019,8 @@ public final class MessageTypeProto { case 12103: return VIP_LEVELUP_RESPONSE; case 12104: return VIP_TAKE_REWARD_REQUEST; case 12105: return VIP_TAKE_REWARD_RESPONSE; + case 12106: return VIEW_HERO_INFO_REQUEST; + case 12107: return VIEW_HERO_INFO_RESPONSE; case 12200: return WORKSHOP_FOUNDATION_REQUEST; case 12201: return WORKSHOP_FOUNDATION_RESPONSE; case 12202: return WORKSHOP_EQUIP_CREATE_REQUEST; @@ -6070,7 +6096,7 @@ public final class MessageTypeProto { static { java.lang.String[] descriptorData = { "\n\026MessageTypeProto.proto\022\032com.ljsd.jieli" + - "ng.protocols*\216o\n\013MessageType\022\027\n\022HEART_BE" + + "ng.protocols*\275o\n\013MessageType\022\027\n\022HEART_BE" + "AT_REQUEST\020\350\007\022\030\n\023HEART_BEAT_RESPONSE\020\351\007\022" + "\036\n\031ACTIVITE_WORKSHOP_REQUEST\020\224N\022\037\n\032ACTIV" + "ITE_WORKSHOP_RESPONSE\020\225N\022\027\n\022ARENA_INFO_R" + @@ -6299,134 +6325,135 @@ public final class MessageTypeProto { "\n\031MAP_TOWER_USEBOMB_REQUEST\020\335W\022\037\n\032MAP_TO" + "WER_USEBOMB_RESPONSE\020\336W\022\036\n\031MAP_TOWER_USE" + "BUFF_REQUEST\020\337W\022\037\n\032MAP_TOWER_USEBUFF_RES", - "PONSE\020\340W\022\036\n\031MODIFY_HEAD_FRAME_REQUEST\020\341W" + - "\022\037\n\032MODIFY_HEAD_FRAME_RESPONSE\020\342W\022\027\n\022MAP" + - "_OUT_INDICATION\020\343W\022 \n\033MAIN_LEVEL_GET_INF" + - "O_REQUEST\020\344W\022!\n\034MAIN_LEVEL_GET_INFO_RESP" + - "ONSE\020\345W\022)\n$MAIN_LEVEL_TAKE_STATE_REWARD_" + - "REQUEST\020\346W\022*\n%MAIN_LEVEL_TAKE_STATE_REWA" + - "RD_RESPONSE\020\347W\022 \n\033MAIN_LEVEL_GET_RANK_RE" + - "QUEST\020\350W\022!\n\034MAIN_LEVEL_GET_RANK_RESPONSE" + - "\020\351W\022\030\n\023MAIL_DELETE_REQUEST\020\352W\022\031\n\024MAIL_DE" + - "LETE_RESPONSE\020\353W\022\"\n\035NOTIFY_PAY_SUCCESS_I", - "NDICATION\020\244X\022&\n!POKEMON_COMONPENT_LEVELU" + - "P_REQUEST\020\354Y\022\'\n\"POKEMON_COMONPENT_LEVELU" + - "P_RESPONSE\020\355Y\022\035\n\030POKEMON_ADVANCED_REQUES" + - "T\020\356Y\022\036\n\031POKEMON_ADVANCED_RESPONSE\020\357Y\022 \n\033" + - "PLAYER_BACKCINFO_INDICATION\020\360Y\022\031\n\024PLAY_W" + - "ITH_SB_REQUEST\020\361Y\022\032\n\025PLAY_WITH_SB_RESPON" + - "SE\020\362Y\022\030\n\023QUESTION_INDICATION\020\320Z\022\'\n\"QUICK" + - "_START_MONSTERFIGHTER_REQUEST\020\321Z\022\'\n\"QUIC" + - "K_START_MONSTERFIGHTER_REPONSE\020\322Z\022\026\n\021REC" + - "ONNECT_REQUEST\020\264[\022\027\n\022RECONNECT_RESPONSE\020", - "\265[\022\027\n\022RANDOMNAME_REQUEST\020\266[\022\030\n\023RANDOMNAM" + - "E_RESPONSE\020\267[\022\023\n\016RENAME_REQUEST\020\270[\022\024\n\017RE" + - "NAME_RESPONSE\020\271[\022\032\n\025RINGFIRE_LOAD_REQUES" + - "T\020\272[\022\033\n\026RINGFIRE_LOAD_RESPONSE\020\273[\022\036\n\031RIN" + - "GFIRE_ADVANCED_REQUEST\020\274[\022\037\n\032RINGFIRE_AD" + - "VANCED_RESPONSE\020\275[\022!\n\034REFRESH_FRIEND_STA" + - "TE_REQEUST\020\276[\022\"\n\035REFRESH_FRIEND_STATE_RE" + - "SPONSE\020\277[\022\027\n\022ROOM_MATCH_REQUEST\020\300[\022\030\n\023RO" + - "OM_MATCH_RESPONSE\020\301[\022\036\n\031ROOM_CANCEL_MATC" + - "H_REQUEST\020\302[\022\037\n\032ROOM_CANCEL_MATCH_RESPON", - "SE\020\303[\022\"\n\035ROOM_MATCH_SUCCESS_INDICATION\020\304" + - "[\022\"\n\035ROOM_START_GAME_READY_REQUEST\020\306[\022#\n" + - "\036ROOM_START_GAME_READY_RESPONSE\020\307[\022\037\n\032RO" + - "OM_START_GAME_INDICATION\020\310[\022\034\n\027ROOM_GAME" + - "_START_REQUEST\020\312[\022\035\n\030ROOM_GAME_START_RES" + - "PONSE\020\313[\022\035\n\030ROOM_GAME_END_INDICATION\020\314[\022" + - "\"\n\035ROOM_SYNC_MYSELF_MOVE_REQUEST\020\316[\022#\n\036R" + - "OOM_SYNC_MYSELF_MOVE_RESPONSE\020\317[\022#\n\036ROOM" + - "_SYNC_OTHER_MOVE_INDICTION\020\320[\022\"\n\035ROOM_TR" + - "IGGER_FIGHT_INDICATION\020\322[\022\037\n\032ROOM_GET_FU", - "LL_INFO_REQEUST\020\323[\022 \n\033ROOM_GET_FULL_INFO" + - "_RESPONSE\020\324[\022\"\n\035ROOM_MAP_UPDATE_EVENT_RE" + - "QUEST\020\325[\022#\n\036ROOM_MAP_UPDATE_EVENT_RESPON" + - "SE\020\326[\022\036\n\031ROOM_MAP_POINT_INDICATION\020\327[\022#\n" + - "\036ROOM_PLAY_HP_UPDATE_INDICATION\020\330[\022\035\n\030RE" + - "FRESH_ITEM_NUM_REQUEST\020\331[\022\036\n\031REFRESH_ITE" + - "M_NUM_RESPONSE\020\332[\022\034\n\027ROOM_ADDRESS_INDICA" + - "TION\020\333[\022\027\n\022ROOM_LOGIN_REQEUST\020\334[\022\030\n\023ROOM" + - "_LOGIN_RESPONSE\020\346[\022\036\n\031REFRESH_LUCKWHEEL_" + - "REQUEST\020\347[\022\037\n\032REFRESH_LUCKWHEEL_RESPONSE", - "\020\350[\022\025\n\020SUCCESS_RESPONSE\020\230\\\022 \n\033SWITCH_WOR" + - "LDCHANNEL_REQUEST\020\232\\\022!\n\034SWITCH_WORLDCHAN" + - "NEL_RESPONSE\020\233\\\022\033\n\026SEND_CHAT_INFO_REQUES" + - "T\020\234\\\022\034\n\027SEND_CHAT_INFO_RESPONSE\020\235\\\022\036\n\031SE" + - "ND_RED_POINT_INDICATION\020\236\\\022(\n#SAVE_NEW_P" + - "LAYER_GUIDE_POINT_REQUEST\020\237\\\022)\n$SAVE_NEW" + - "_PLAYER_GUIDE_POINT_RESPONSE\020\240\\\022\030\n\023SWEEP" + - "_RIGHT_REQUEST\020\241\\\022\031\n\024SWEEP_RIGHT_RESPONS" + - "E\020\242\\\022\035\n\030SECRETBOX_RANDOM_REQUEST\020\243\\\022\036\n\031S" + - "ECRETBOX_RANDOM_RESPONSE\020\244\\\022 \n\033STORE_GOO", - "DS_REFRESH_REQUEST\020\245\\\022!\n\034STORE_GOODS_REF" + - "RESH_RESPONSE\020\246\\\022\032\n\025RECHARGE_INFO_REQUES" + - "T\020\247\\\022\033\n\026RECHARGE_INFO_RESPONSE\020\250\\\022 \n\033SEN" + - "D_FRIEND_INFO_INDICATION\020\251\\\022\036\n\031SEND_CHAT" + - "_INFO_INDICATION\020\252\\\022!\n\034SEND_FRIEND_STATE" + - "_INDICATION\020\253\\\022 \n\033SCENE_MSG_UPDATE_INDIC" + - "ATION\020\254\\\022\037\n\032SCENE_GET_FULL_MSG_REQUEST\020\255" + - "\\\022 \n\033SCENE_GET_FULL_MSG_RESPONSE\020\256\\\022\032\n\025S" + - "CENE_COMMAND_REQUEST\020\257\\\022\033\n\026SCENE_COMMAND" + - "_RESPONSE\020\260\\\022\030\n\023SERVER_ZERO_REQUEST\020\261\\\022\034", - "\n\027STORE_UPDATE_INDICATION\020\262\\\022\024\n\017SIGN_IN_" + - "REQUEST\020\263\\\022\025\n\020SIGN_IN_RESPONSE\020\264\\\022%\n SCE" + - "NE_GAME_OVER_READY_INDICATION\020\265\\\022\037\n\032SCEN" + - "E_GAME_OVER_INDICATION\020\266\\\022\034\n\027SOUL_EQUIP_" + - "WEAR_REQUEST\020\267\\\022\035\n\030SOUL_EQUIP_WEAR_RESPO" + - "NSE\020\270\\\022\"\n\035SOUL_EQUIP_UNLOAD_OPT_REQUEST\020" + - "\271\\\022#\n\036SOUL_EQUIP_UNLOAD_OPT_RESPONSE\020\272\\\022" + - "\034\n\027SOUL_RAND_EQUIP_REQUEST\020\273\\\022\035\n\030SOUL_RA" + - "ND_EQUIP_RESPONSE\020\274\\\022\"\n\035SOUL_FORCE_RAND_" + - "EQUIP_REQUEST\020\275\\\022#\n\036SOUL_FORCE_RAND_EQUI", - "P_RESPONSE\020\276\\\022\032\n\025TRIGGER_EVENT_REQUEST\020\374" + - "\\\022\033\n\026TRIGGER_EVENT_RESPONSE\020\375\\\022\032\n\025TEAM_P" + - "OS_SAVE_REQUEST\020\376\\\022\033\n\026TEAM_POS_SAVE_RESP" + - "ONSE\020\377\\\022!\n\034TAKE_ACTIVITY_REWARD_REQUEST\020" + - "\200]\022\"\n\035TAKE_ACTIVITY_REWARD_RESPONSE\020\201]\022 " + - "\n\033TAKE_MISSION_REWARD_REQUEST\020\202]\022!\n\034TAKE" + - "_MISSION_REWARD_RESPONSE\020\203]\022 \n\033TEST_BUY_" + - "GIGT_GOODS_REQEUST\020\204]\022!\n\034TEST_BUY_GIGT_G" + - "OODS_RESPONSE\020\205]\022\036\n\031TAKE_TOWER_REWARD_RE" + - "QUEST\020\206]\022\037\n\032TAKE_TOWER_REWARD_RESPONSE\020\207", - "]\022$\n\037TAKE_SEVEN_HAPPY_REWARD_REQUEST\020\210]\022" + - "%\n TAKE_SEVEN_HAPPY_REWARD_RESPONSE\020\211]\022\033" + - "\n\026TO_BE_STRONGER_REQUEST\020\212]\022\034\n\027TO_BE_STR" + - "ONGER_RESPONSE\020\213]\022 \n\033TREASURE_REFRESH_IN" + - "DICATION\020\214]\022 \n\033TREASURE_LEVELUP_INDICATI" + - "ON\020\215]\022\032\n\025UP_HERO_LEVEL_REQUEST\020\340]\022\033\n\026UP_" + - "HERO_LEVEL_RESPONSE\020\341]\022\031\n\024UP_HERO_STAR_R" + - "EQUEST\020\342]\022\032\n\025UP_HERO_STAR_RESPONSE\020\343]\022 \n" + - "\033USER_AND_PRICE_ITEM_REQUEST\020\344]\022!\n\034USER_" + - "AND_PRICE_ITEM_RESPONSE\020\345]\022\036\n\031USER_FORCE", - "_CHANGE_REQUEST\020\346]\022\037\n\032USER_FORCE_CHANGE_" + - "RESPONSE\020\347]\022\032\n\025UPDATE_BAG_INDICATION\020\350]\022" + - "\031\n\024UPDATE_STATE_REQUEST\020\351]\022\032\n\025UPDATE_STA" + - "TE_RESPONSE\020\352]\022\037\n\032UPDATE_USER_EXP_INDICA" + - "TION\020\353]\022(\n#UPDATE_SECRET_BOX_SEASON_INDI" + - "CATION\020\354]\022\036\n\031UPDATE_PHONE_INFO_REQUEST\020\355" + - "]\022\037\n\032UPDATE_PHONE_INFO_RESPONSE\020\356]\022\034\n\027UP" + - "DATE_QUESTION_REQUEST\020\357]\022\035\n\030UPDATE_QUEST" + - "ION_RESPONSE\020\360]\022 \n\033UP_SOUL_EQUIP_QUICK_R" + - "EQUEST\020\362]\022\033\n\026UP_SOUL_EQUIP_RESPONSE\020\363]\022\035", - "\n\030VIEW_FIGHTREPLAY_REQUEST\020\304^\022\036\n\031VIEW_FI" + - "GHTREPLAY_RESPONSE\020\305^\022\030\n\023VIP_LEVELUP_REQ" + - "EUST\020\306^\022\031\n\024VIP_LEVELUP_RESPONSE\020\307^\022\034\n\027VI" + - "P_TAKE_REWARD_REQUEST\020\310^\022\035\n\030VIP_TAKE_REW" + - "ARD_RESPONSE\020\311^\022 \n\033WORKSHOP_FOUNDATION_R" + - "EQUEST\020\250_\022!\n\034WORKSHOP_FOUNDATION_RESPONS" + - "E\020\251_\022\"\n\035WORKSHOP_EQUIP_CREATE_REQUEST\020\252_" + - "\022#\n\036WORKSHOP_EQUIP_CREATE_RESPONSE\020\253_\022\035\n" + - "\030WORKSHOP_REBUILD_REQUEST\020\254_\022\036\n\031WORKSHOP" + - "_REBUILD_RESPONSE\020\255_\022%\n WORKSHOP_REBUILD", - "_CONFIRM_REQUEST\020\256_\022%\n WORKSHOP_REBUILD_" + - "CONFIRM_RESONSE\020\257_\022\035\n\030WORKSHOP_LEVELUP_R" + - "EQUEST\020\260_\022\036\n\031WORKSHOP_LEVELUP_RESPONSE\020\261" + - "_\022&\n!WORKSHOP_TECHNOLOGY_LEVEL_REQUEST\020\262" + - "_\022!\n\034WORKSHOP_TECHNOLOGY_RESPONSE\020\263_\022&\n!" + - "WORKSHOP_TECHNOLOGY_RESET_REQUEST\020\264_\022\'\n\"" + - "WORKSHOP_TECHNOLOGY_RESET_RESPONSE\020\265_B\002H" + - "\001" + "PONSE\020\340W\022\030\n\023MODIFY_HEAD_REQUEST\020\341W\022\031\n\024MO" + + "DIFY_HEAD_RESPONSE\020\342W\022\027\n\022MAP_OUT_INDICAT" + + "ION\020\343W\022 \n\033MAIN_LEVEL_GET_INFO_REQUEST\020\344W" + + "\022!\n\034MAIN_LEVEL_GET_INFO_RESPONSE\020\345W\022)\n$M" + + "AIN_LEVEL_TAKE_STATE_REWARD_REQUEST\020\346W\022*" + + "\n%MAIN_LEVEL_TAKE_STATE_REWARD_RESPONSE\020" + + "\347W\022 \n\033MAIN_LEVEL_GET_RANK_REQUEST\020\350W\022!\n\034" + + "MAIN_LEVEL_GET_RANK_RESPONSE\020\351W\022\030\n\023MAIL_" + + "DELETE_REQUEST\020\352W\022\031\n\024MAIL_DELETE_RESPONS" + + "E\020\353W\022\"\n\035NOTIFY_PAY_SUCCESS_INDICATION\020\244X", + "\022&\n!POKEMON_COMONPENT_LEVELUP_REQUEST\020\354Y" + + "\022\'\n\"POKEMON_COMONPENT_LEVELUP_RESPONSE\020\355" + + "Y\022\035\n\030POKEMON_ADVANCED_REQUEST\020\356Y\022\036\n\031POKE" + + "MON_ADVANCED_RESPONSE\020\357Y\022 \n\033PLAYER_BACKC" + + "INFO_INDICATION\020\360Y\022\031\n\024PLAY_WITH_SB_REQUE" + + "ST\020\361Y\022\032\n\025PLAY_WITH_SB_RESPONSE\020\362Y\022\030\n\023QUE" + + "STION_INDICATION\020\320Z\022\'\n\"QUICK_START_MONST" + + "ERFIGHTER_REQUEST\020\321Z\022\'\n\"QUICK_START_MONS" + + "TERFIGHTER_REPONSE\020\322Z\022\026\n\021RECONNECT_REQUE" + + "ST\020\264[\022\027\n\022RECONNECT_RESPONSE\020\265[\022\027\n\022RANDOM", + "NAME_REQUEST\020\266[\022\030\n\023RANDOMNAME_RESPONSE\020\267" + + "[\022\023\n\016RENAME_REQUEST\020\270[\022\024\n\017RENAME_RESPONS" + + "E\020\271[\022\032\n\025RINGFIRE_LOAD_REQUEST\020\272[\022\033\n\026RING" + + "FIRE_LOAD_RESPONSE\020\273[\022\036\n\031RINGFIRE_ADVANC" + + "ED_REQUEST\020\274[\022\037\n\032RINGFIRE_ADVANCED_RESPO" + + "NSE\020\275[\022!\n\034REFRESH_FRIEND_STATE_REQEUST\020\276" + + "[\022\"\n\035REFRESH_FRIEND_STATE_RESPONSE\020\277[\022\027\n" + + "\022ROOM_MATCH_REQUEST\020\300[\022\030\n\023ROOM_MATCH_RES" + + "PONSE\020\301[\022\036\n\031ROOM_CANCEL_MATCH_REQUEST\020\302[" + + "\022\037\n\032ROOM_CANCEL_MATCH_RESPONSE\020\303[\022\"\n\035ROO", + "M_MATCH_SUCCESS_INDICATION\020\304[\022\"\n\035ROOM_ST" + + "ART_GAME_READY_REQUEST\020\306[\022#\n\036ROOM_START_" + + "GAME_READY_RESPONSE\020\307[\022\037\n\032ROOM_START_GAM" + + "E_INDICATION\020\310[\022\034\n\027ROOM_GAME_START_REQUE" + + "ST\020\312[\022\035\n\030ROOM_GAME_START_RESPONSE\020\313[\022\035\n\030" + + "ROOM_GAME_END_INDICATION\020\314[\022\"\n\035ROOM_SYNC" + + "_MYSELF_MOVE_REQUEST\020\316[\022#\n\036ROOM_SYNC_MYS" + + "ELF_MOVE_RESPONSE\020\317[\022#\n\036ROOM_SYNC_OTHER_" + + "MOVE_INDICTION\020\320[\022\"\n\035ROOM_TRIGGER_FIGHT_" + + "INDICATION\020\322[\022\037\n\032ROOM_GET_FULL_INFO_REQE", + "UST\020\323[\022 \n\033ROOM_GET_FULL_INFO_RESPONSE\020\324[" + + "\022\"\n\035ROOM_MAP_UPDATE_EVENT_REQUEST\020\325[\022#\n\036" + + "ROOM_MAP_UPDATE_EVENT_RESPONSE\020\326[\022\036\n\031ROO" + + "M_MAP_POINT_INDICATION\020\327[\022#\n\036ROOM_PLAY_H" + + "P_UPDATE_INDICATION\020\330[\022\035\n\030REFRESH_ITEM_N" + + "UM_REQUEST\020\331[\022\036\n\031REFRESH_ITEM_NUM_RESPON" + + "SE\020\332[\022\034\n\027ROOM_ADDRESS_INDICATION\020\333[\022\027\n\022R" + + "OOM_LOGIN_REQEUST\020\334[\022\030\n\023ROOM_LOGIN_RESPO" + + "NSE\020\346[\022\036\n\031REFRESH_LUCKWHEEL_REQUEST\020\347[\022\037" + + "\n\032REFRESH_LUCKWHEEL_RESPONSE\020\350[\022\025\n\020SUCCE", + "SS_RESPONSE\020\230\\\022 \n\033SWITCH_WORLDCHANNEL_RE" + + "QUEST\020\232\\\022!\n\034SWITCH_WORLDCHANNEL_RESPONSE" + + "\020\233\\\022\033\n\026SEND_CHAT_INFO_REQUEST\020\234\\\022\034\n\027SEND" + + "_CHAT_INFO_RESPONSE\020\235\\\022\036\n\031SEND_RED_POINT" + + "_INDICATION\020\236\\\022(\n#SAVE_NEW_PLAYER_GUIDE_" + + "POINT_REQUEST\020\237\\\022)\n$SAVE_NEW_PLAYER_GUID" + + "E_POINT_RESPONSE\020\240\\\022\030\n\023SWEEP_RIGHT_REQUE" + + "ST\020\241\\\022\031\n\024SWEEP_RIGHT_RESPONSE\020\242\\\022\035\n\030SECR" + + "ETBOX_RANDOM_REQUEST\020\243\\\022\036\n\031SECRETBOX_RAN" + + "DOM_RESPONSE\020\244\\\022 \n\033STORE_GOODS_REFRESH_R", + "EQUEST\020\245\\\022!\n\034STORE_GOODS_REFRESH_RESPONS" + + "E\020\246\\\022\032\n\025RECHARGE_INFO_REQUEST\020\247\\\022\033\n\026RECH" + + "ARGE_INFO_RESPONSE\020\250\\\022 \n\033SEND_FRIEND_INF" + + "O_INDICATION\020\251\\\022\036\n\031SEND_CHAT_INFO_INDICA" + + "TION\020\252\\\022!\n\034SEND_FRIEND_STATE_INDICATION\020" + + "\253\\\022 \n\033SCENE_MSG_UPDATE_INDICATION\020\254\\\022\037\n\032" + + "SCENE_GET_FULL_MSG_REQUEST\020\255\\\022 \n\033SCENE_G" + + "ET_FULL_MSG_RESPONSE\020\256\\\022\032\n\025SCENE_COMMAND" + + "_REQUEST\020\257\\\022\033\n\026SCENE_COMMAND_RESPONSE\020\260\\" + + "\022\030\n\023SERVER_ZERO_REQUEST\020\261\\\022\034\n\027STORE_UPDA", + "TE_INDICATION\020\262\\\022\024\n\017SIGN_IN_REQUEST\020\263\\\022\025" + + "\n\020SIGN_IN_RESPONSE\020\264\\\022%\n SCENE_GAME_OVER" + + "_READY_INDICATION\020\265\\\022\037\n\032SCENE_GAME_OVER_" + + "INDICATION\020\266\\\022\034\n\027SOUL_EQUIP_WEAR_REQUEST" + + "\020\267\\\022\035\n\030SOUL_EQUIP_WEAR_RESPONSE\020\270\\\022\"\n\035SO" + + "UL_EQUIP_UNLOAD_OPT_REQUEST\020\271\\\022#\n\036SOUL_E" + + "QUIP_UNLOAD_OPT_RESPONSE\020\272\\\022\034\n\027SOUL_RAND" + + "_EQUIP_REQUEST\020\273\\\022\035\n\030SOUL_RAND_EQUIP_RES" + + "PONSE\020\274\\\022\"\n\035SOUL_FORCE_RAND_EQUIP_REQUES" + + "T\020\275\\\022#\n\036SOUL_FORCE_RAND_EQUIP_RESPONSE\020\276", + "\\\022\032\n\025TRIGGER_EVENT_REQUEST\020\374\\\022\033\n\026TRIGGER" + + "_EVENT_RESPONSE\020\375\\\022\032\n\025TEAM_POS_SAVE_REQU" + + "EST\020\376\\\022\033\n\026TEAM_POS_SAVE_RESPONSE\020\377\\\022!\n\034T" + + "AKE_ACTIVITY_REWARD_REQUEST\020\200]\022\"\n\035TAKE_A" + + "CTIVITY_REWARD_RESPONSE\020\201]\022 \n\033TAKE_MISSI" + + "ON_REWARD_REQUEST\020\202]\022!\n\034TAKE_MISSION_REW" + + "ARD_RESPONSE\020\203]\022 \n\033TEST_BUY_GIGT_GOODS_R" + + "EQEUST\020\204]\022!\n\034TEST_BUY_GIGT_GOODS_RESPONS" + + "E\020\205]\022\036\n\031TAKE_TOWER_REWARD_REQUEST\020\206]\022\037\n\032" + + "TAKE_TOWER_REWARD_RESPONSE\020\207]\022$\n\037TAKE_SE", + "VEN_HAPPY_REWARD_REQUEST\020\210]\022%\n TAKE_SEVE" + + "N_HAPPY_REWARD_RESPONSE\020\211]\022\033\n\026TO_BE_STRO" + + "NGER_REQUEST\020\212]\022\034\n\027TO_BE_STRONGER_RESPON" + + "SE\020\213]\022 \n\033TREASURE_REFRESH_INDICATION\020\214]\022" + + " \n\033TREASURE_LEVELUP_INDICATION\020\215]\022\032\n\025UP_" + + "HERO_LEVEL_REQUEST\020\340]\022\033\n\026UP_HERO_LEVEL_R" + + "ESPONSE\020\341]\022\031\n\024UP_HERO_STAR_REQUEST\020\342]\022\032\n" + + "\025UP_HERO_STAR_RESPONSE\020\343]\022 \n\033USER_AND_PR" + + "ICE_ITEM_REQUEST\020\344]\022!\n\034USER_AND_PRICE_IT" + + "EM_RESPONSE\020\345]\022\036\n\031USER_FORCE_CHANGE_REQU", + "EST\020\346]\022\037\n\032USER_FORCE_CHANGE_RESPONSE\020\347]\022" + + "\032\n\025UPDATE_BAG_INDICATION\020\350]\022\031\n\024UPDATE_ST" + + "ATE_REQUEST\020\351]\022\032\n\025UPDATE_STATE_RESPONSE\020" + + "\352]\022\037\n\032UPDATE_USER_EXP_INDICATION\020\353]\022(\n#U" + + "PDATE_SECRET_BOX_SEASON_INDICATION\020\354]\022\036\n" + + "\031UPDATE_PHONE_INFO_REQUEST\020\355]\022\037\n\032UPDATE_" + + "PHONE_INFO_RESPONSE\020\356]\022\034\n\027UPDATE_QUESTIO" + + "N_REQUEST\020\357]\022\035\n\030UPDATE_QUESTION_RESPONSE" + + "\020\360]\022 \n\033UP_SOUL_EQUIP_QUICK_REQUEST\020\362]\022\033\n" + + "\026UP_SOUL_EQUIP_RESPONSE\020\363]\022\035\n\030VIEW_FIGHT", + "REPLAY_REQUEST\020\304^\022\036\n\031VIEW_FIGHTREPLAY_RE" + + "SPONSE\020\305^\022\030\n\023VIP_LEVELUP_REQEUST\020\306^\022\031\n\024V" + + "IP_LEVELUP_RESPONSE\020\307^\022\034\n\027VIP_TAKE_REWAR" + + "D_REQUEST\020\310^\022\035\n\030VIP_TAKE_REWARD_RESPONSE" + + "\020\311^\022\033\n\026VIEW_HERO_INFO_REQUEST\020\312^\022\034\n\027VIEW" + + "_HERO_INFO_RESPONSE\020\313^\022 \n\033WORKSHOP_FOUND" + + "ATION_REQUEST\020\250_\022!\n\034WORKSHOP_FOUNDATION_" + + "RESPONSE\020\251_\022\"\n\035WORKSHOP_EQUIP_CREATE_REQ" + + "UEST\020\252_\022#\n\036WORKSHOP_EQUIP_CREATE_RESPONS" + + "E\020\253_\022\035\n\030WORKSHOP_REBUILD_REQUEST\020\254_\022\036\n\031W", + "ORKSHOP_REBUILD_RESPONSE\020\255_\022%\n WORKSHOP_" + + "REBUILD_CONFIRM_REQUEST\020\256_\022%\n WORKSHOP_R" + + "EBUILD_CONFIRM_RESONSE\020\257_\022\035\n\030WORKSHOP_LE" + + "VELUP_REQUEST\020\260_\022\036\n\031WORKSHOP_LEVELUP_RES" + + "PONSE\020\261_\022&\n!WORKSHOP_TECHNOLOGY_LEVEL_RE" + + "QUEST\020\262_\022!\n\034WORKSHOP_TECHNOLOGY_RESPONSE" + + "\020\263_\022&\n!WORKSHOP_TECHNOLOGY_RESET_REQUEST" + + "\020\264_\022\'\n\"WORKSHOP_TECHNOLOGY_RESET_RESPONS" + + "E\020\265_B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/PlayerInfoProto.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/PlayerInfoProto.java index 73afbdecc..afdcc585d 100644 --- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/PlayerInfoProto.java +++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/PlayerInfoProto.java @@ -47847,7 +47847,7 @@ public final class PlayerInfoProto { * optional int32 type = 1; * *
-     * 操作类型 : 1 加入黑名单 2 解除黑名单
+     * 操作类型 : 1 加入黑名单 2 解除黑名单 3一键移除
      * 
*/ boolean hasType(); @@ -47855,7 +47855,7 @@ public final class PlayerInfoProto { * optional int32 type = 1; * *
-     * 操作类型 : 1 加入黑名单 2 解除黑名单
+     * 操作类型 : 1 加入黑名单 2 解除黑名单 3一键移除
      * 
*/ int getType(); @@ -47986,7 +47986,7 @@ public final class PlayerInfoProto { * optional int32 type = 1; * *
-     * 操作类型 : 1 加入黑名单 2 解除黑名单
+     * 操作类型 : 1 加入黑名单 2 解除黑名单 3一键移除
      * 
*/ public boolean hasType() { @@ -47996,7 +47996,7 @@ public final class PlayerInfoProto { * optional int32 type = 1; * *
-     * 操作类型 : 1 加入黑名单 2 解除黑名单
+     * 操作类型 : 1 加入黑名单 2 解除黑名单 3一键移除
      * 
*/ public int getType() { @@ -48277,7 +48277,7 @@ public final class PlayerInfoProto { * optional int32 type = 1; * *
-       * 操作类型 : 1 加入黑名单 2 解除黑名单
+       * 操作类型 : 1 加入黑名单 2 解除黑名单 3一键移除
        * 
*/ public boolean hasType() { @@ -48287,7 +48287,7 @@ public final class PlayerInfoProto { * optional int32 type = 1; * *
-       * 操作类型 : 1 加入黑名单 2 解除黑名单
+       * 操作类型 : 1 加入黑名单 2 解除黑名单 3一键移除
        * 
*/ public int getType() { @@ -48297,7 +48297,7 @@ public final class PlayerInfoProto { * optional int32 type = 1; * *
-       * 操作类型 : 1 加入黑名单 2 解除黑名单
+       * 操作类型 : 1 加入黑名单 2 解除黑名单 3一键移除
        * 
*/ public Builder setType(int value) { @@ -48310,7 +48310,7 @@ public final class PlayerInfoProto { * optional int32 type = 1; * *
-       * 操作类型 : 1 加入黑名单 2 解除黑名单
+       * 操作类型 : 1 加入黑名单 2 解除黑名单 3一键移除
        * 
*/ public Builder clearType() { @@ -54704,46 +54704,64 @@ public final class PlayerInfoProto { // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.UpdateBagIndication) } - public interface modifyHeadFrameRequestOrBuilder + public interface ModifyHeadRequestOrBuilder extends com.google.protobuf.MessageOrBuilder { - // optional int32 headFrameId = 1; + // optional int32 headId = 1; /** - * optional int32 headFrameId = 1; + * optional int32 headId = 1; * *
-     *修改头像框
+     *修改头像或头像框
      * 
*/ - boolean hasHeadFrameId(); + boolean hasHeadId(); /** - * optional int32 headFrameId = 1; + * optional int32 headId = 1; * *
-     *修改头像框
+     *修改头像或头像框
      * 
*/ - int getHeadFrameId(); + int getHeadId(); + + // optional int32 type = 2; + /** + * optional int32 type = 2; + * + *
+     *0头像框,1头像
+     * 
+ */ + boolean hasType(); + /** + * optional int32 type = 2; + * + *
+     *0头像框,1头像
+     * 
+ */ + int getType(); } /** - * Protobuf type {@code com.ljsd.jieling.protocols.modifyHeadFrameRequest} + * Protobuf type {@code com.ljsd.jieling.protocols.ModifyHeadRequest} */ - public static final class modifyHeadFrameRequest extends + public static final class ModifyHeadRequest extends com.google.protobuf.GeneratedMessage - implements modifyHeadFrameRequestOrBuilder { - // Use modifyHeadFrameRequest.newBuilder() to construct. - private modifyHeadFrameRequest(com.google.protobuf.GeneratedMessage.Builder builder) { + implements ModifyHeadRequestOrBuilder { + // Use ModifyHeadRequest.newBuilder() to construct. + private ModifyHeadRequest(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - private modifyHeadFrameRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + private ModifyHeadRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - private static final modifyHeadFrameRequest defaultInstance; - public static modifyHeadFrameRequest getDefaultInstance() { + private static final ModifyHeadRequest defaultInstance; + public static ModifyHeadRequest getDefaultInstance() { return defaultInstance; } - public modifyHeadFrameRequest getDefaultInstanceForType() { + public ModifyHeadRequest getDefaultInstanceForType() { return defaultInstance; } @@ -54753,7 +54771,7 @@ public final class PlayerInfoProto { getUnknownFields() { return this.unknownFields; } - private modifyHeadFrameRequest( + private ModifyHeadRequest( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -54778,7 +54796,12 @@ public final class PlayerInfoProto { } case 8: { bitField0_ |= 0x00000001; - headFrameId_ = input.readInt32(); + headId_ = input.readInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + type_ = input.readInt32(); break; } } @@ -54795,58 +54818,83 @@ public final class PlayerInfoProto { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_modifyHeadFrameRequest_descriptor; + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ModifyHeadRequest_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_modifyHeadFrameRequest_fieldAccessorTable + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ModifyHeadRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest.class, com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest.Builder.class); + com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest.class, com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest.Builder.class); } - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public modifyHeadFrameRequest parsePartialFrom( + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public ModifyHeadRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new modifyHeadFrameRequest(input, extensionRegistry); + return new ModifyHeadRequest(input, extensionRegistry); } }; @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } private int bitField0_; - // optional int32 headFrameId = 1; - public static final int HEADFRAMEID_FIELD_NUMBER = 1; - private int headFrameId_; + // optional int32 headId = 1; + public static final int HEADID_FIELD_NUMBER = 1; + private int headId_; /** - * optional int32 headFrameId = 1; + * optional int32 headId = 1; * *
-     *修改头像框
+     *修改头像或头像框
      * 
*/ - public boolean hasHeadFrameId() { + public boolean hasHeadId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional int32 headFrameId = 1; + * optional int32 headId = 1; * *
-     *修改头像框
+     *修改头像或头像框
      * 
*/ - public int getHeadFrameId() { - return headFrameId_; + public int getHeadId() { + return headId_; + } + + // optional int32 type = 2; + public static final int TYPE_FIELD_NUMBER = 2; + private int type_; + /** + * optional int32 type = 2; + * + *
+     *0头像框,1头像
+     * 
+ */ + public boolean hasType() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 type = 2; + * + *
+     *0头像框,1头像
+     * 
+ */ + public int getType() { + return type_; } private void initFields() { - headFrameId_ = 0; + headId_ = 0; + type_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -54861,7 +54909,10 @@ public final class PlayerInfoProto { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeInt32(1, headFrameId_); + output.writeInt32(1, headId_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(2, type_); } getUnknownFields().writeTo(output); } @@ -54874,7 +54925,11 @@ public final class PlayerInfoProto { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, headFrameId_); + .computeInt32Size(1, headId_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, type_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -54888,53 +54943,53 @@ public final class PlayerInfoProto { return super.writeReplace(); } - public static com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest parseFrom( + public static com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest parseFrom( + public static com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest parseFrom(byte[] data) + public static com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest parseFrom( + public static com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest parseFrom(java.io.InputStream input) + public static com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest parseFrom( + public static com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest parseDelimitedFrom(java.io.InputStream input) + public static com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest parseDelimitedFrom( + public static com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest parseFrom( + public static com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest parseFrom( + public static com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -54943,7 +54998,7 @@ public final class PlayerInfoProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest prototype) { + public static Builder newBuilder(com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -54955,24 +55010,24 @@ public final class PlayerInfoProto { return builder; } /** - * Protobuf type {@code com.ljsd.jieling.protocols.modifyHeadFrameRequest} + * Protobuf type {@code com.ljsd.jieling.protocols.ModifyHeadRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequestOrBuilder { + implements com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_modifyHeadFrameRequest_descriptor; + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ModifyHeadRequest_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_modifyHeadFrameRequest_fieldAccessorTable + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ModifyHeadRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest.class, com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest.Builder.class); + com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest.class, com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest.Builder.class); } - // Construct using com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest.newBuilder() + // Construct using com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -54992,8 +55047,10 @@ public final class PlayerInfoProto { public Builder clear() { super.clear(); - headFrameId_ = 0; + headId_ = 0; bitField0_ = (bitField0_ & ~0x00000001); + type_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -55003,47 +55060,54 @@ public final class PlayerInfoProto { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_modifyHeadFrameRequest_descriptor; + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ModifyHeadRequest_descriptor; } - public com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest getDefaultInstanceForType() { - return com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest.getDefaultInstance(); + public com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest.getDefaultInstance(); } - public com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest build() { - com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest result = buildPartial(); + public com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest build() { + com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest buildPartial() { - com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest result = new com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest(this); + public com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest buildPartial() { + com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest result = new com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.headFrameId_ = headFrameId_; + result.headId_ = headId_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.type_ = type_; result.bitField0_ = to_bitField0_; onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest) { - return mergeFrom((com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest)other); + if (other instanceof com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest) { + return mergeFrom((com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest other) { - if (other == com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest.getDefaultInstance()) return this; - if (other.hasHeadFrameId()) { - setHeadFrameId(other.getHeadFrameId()); + public Builder mergeFrom(com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest other) { + if (other == com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest.getDefaultInstance()) return this; + if (other.hasHeadId()) { + setHeadId(other.getHeadId()); + } + if (other.hasType()) { + setType(other.getType()); } this.mergeUnknownFields(other.getUnknownFields()); return this; @@ -55057,11 +55121,11 @@ public final class PlayerInfoProto { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest parsedMessage = null; + com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.ljsd.jieling.protocols.PlayerInfoProto.modifyHeadFrameRequest) e.getUnfinishedMessage(); + parsedMessage = (com.ljsd.jieling.protocols.PlayerInfoProto.ModifyHeadRequest) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -55072,64 +55136,113 @@ public final class PlayerInfoProto { } private int bitField0_; - // optional int32 headFrameId = 1; - private int headFrameId_ ; + // optional int32 headId = 1; + private int headId_ ; /** - * optional int32 headFrameId = 1; + * optional int32 headId = 1; * *
-       *修改头像框
+       *修改头像或头像框
        * 
*/ - public boolean hasHeadFrameId() { + public boolean hasHeadId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional int32 headFrameId = 1; + * optional int32 headId = 1; * *
-       *修改头像框
+       *修改头像或头像框
        * 
*/ - public int getHeadFrameId() { - return headFrameId_; + public int getHeadId() { + return headId_; } /** - * optional int32 headFrameId = 1; + * optional int32 headId = 1; * *
-       *修改头像框
+       *修改头像或头像框
        * 
*/ - public Builder setHeadFrameId(int value) { + public Builder setHeadId(int value) { bitField0_ |= 0x00000001; - headFrameId_ = value; + headId_ = value; onChanged(); return this; } /** - * optional int32 headFrameId = 1; + * optional int32 headId = 1; * *
-       *修改头像框
+       *修改头像或头像框
        * 
*/ - public Builder clearHeadFrameId() { + public Builder clearHeadId() { bitField0_ = (bitField0_ & ~0x00000001); - headFrameId_ = 0; + headId_ = 0; onChanged(); return this; } - // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.modifyHeadFrameRequest) + // optional int32 type = 2; + private int type_ ; + /** + * optional int32 type = 2; + * + *
+       *0头像框,1头像
+       * 
+ */ + public boolean hasType() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 type = 2; + * + *
+       *0头像框,1头像
+       * 
+ */ + public int getType() { + return type_; + } + /** + * optional int32 type = 2; + * + *
+       *0头像框,1头像
+       * 
+ */ + public Builder setType(int value) { + bitField0_ |= 0x00000002; + type_ = value; + onChanged(); + return this; + } + /** + * optional int32 type = 2; + * + *
+       *0头像框,1头像
+       * 
+ */ + public Builder clearType() { + bitField0_ = (bitField0_ & ~0x00000002); + type_ = 0; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ModifyHeadRequest) } static { - defaultInstance = new modifyHeadFrameRequest(true); + defaultInstance = new ModifyHeadRequest(true); defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.modifyHeadFrameRequest) + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ModifyHeadRequest) } public interface blessResponseOrBuilder @@ -84235,6 +84348,2174 @@ public final class PlayerInfoProto { // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.MailDelRequest) } + public interface ViewHeroInfoRequestOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional int32 targetUid = 1; + /** + * optional int32 targetUid = 1; + */ + boolean hasTargetUid(); + /** + * optional int32 targetUid = 1; + */ + int getTargetUid(); + + // optional string heroId = 2; + /** + * optional string heroId = 2; + * + *
+     * 动态id
+     * 
+ */ + boolean hasHeroId(); + /** + * optional string heroId = 2; + * + *
+     * 动态id
+     * 
+ */ + java.lang.String getHeroId(); + /** + * optional string heroId = 2; + * + *
+     * 动态id
+     * 
+ */ + com.google.protobuf.ByteString + getHeroIdBytes(); + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ViewHeroInfoRequest} + */ + public static final class ViewHeroInfoRequest extends + com.google.protobuf.GeneratedMessage + implements ViewHeroInfoRequestOrBuilder { + // Use ViewHeroInfoRequest.newBuilder() to construct. + private ViewHeroInfoRequest(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private ViewHeroInfoRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final ViewHeroInfoRequest defaultInstance; + public static ViewHeroInfoRequest getDefaultInstance() { + return defaultInstance; + } + + public ViewHeroInfoRequest getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ViewHeroInfoRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + targetUid_ = input.readInt32(); + break; + } + case 18: { + bitField0_ |= 0x00000002; + heroId_ = input.readBytes(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ViewHeroInfoRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ViewHeroInfoRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest.class, com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public ViewHeroInfoRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ViewHeroInfoRequest(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional int32 targetUid = 1; + public static final int TARGETUID_FIELD_NUMBER = 1; + private int targetUid_; + /** + * optional int32 targetUid = 1; + */ + public boolean hasTargetUid() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 targetUid = 1; + */ + public int getTargetUid() { + return targetUid_; + } + + // optional string heroId = 2; + public static final int HEROID_FIELD_NUMBER = 2; + private java.lang.Object heroId_; + /** + * optional string heroId = 2; + * + *
+     * 动态id
+     * 
+ */ + public boolean hasHeroId() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional string heroId = 2; + * + *
+     * 动态id
+     * 
+ */ + public java.lang.String getHeroId() { + java.lang.Object ref = heroId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + heroId_ = s; + } + return s; + } + } + /** + * optional string heroId = 2; + * + *
+     * 动态id
+     * 
+ */ + public com.google.protobuf.ByteString + getHeroIdBytes() { + java.lang.Object ref = heroId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + heroId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private void initFields() { + targetUid_ = 0; + heroId_ = ""; + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeInt32(1, targetUid_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeBytes(2, getHeroIdBytes()); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, targetUid_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(2, getHeroIdBytes()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ViewHeroInfoRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ViewHeroInfoRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ViewHeroInfoRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest.class, com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest.Builder.class); + } + + // Construct using com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + targetUid_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + heroId_ = ""; + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ViewHeroInfoRequest_descriptor; + } + + public com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest.getDefaultInstance(); + } + + public com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest build() { + com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest buildPartial() { + com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest result = new com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.targetUid_ = targetUid_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.heroId_ = heroId_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest) { + return mergeFrom((com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest other) { + if (other == com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest.getDefaultInstance()) return this; + if (other.hasTargetUid()) { + setTargetUid(other.getTargetUid()); + } + if (other.hasHeroId()) { + bitField0_ |= 0x00000002; + heroId_ = other.heroId_; + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoRequest) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional int32 targetUid = 1; + private int targetUid_ ; + /** + * optional int32 targetUid = 1; + */ + public boolean hasTargetUid() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 targetUid = 1; + */ + public int getTargetUid() { + return targetUid_; + } + /** + * optional int32 targetUid = 1; + */ + public Builder setTargetUid(int value) { + bitField0_ |= 0x00000001; + targetUid_ = value; + onChanged(); + return this; + } + /** + * optional int32 targetUid = 1; + */ + public Builder clearTargetUid() { + bitField0_ = (bitField0_ & ~0x00000001); + targetUid_ = 0; + onChanged(); + return this; + } + + // optional string heroId = 2; + private java.lang.Object heroId_ = ""; + /** + * optional string heroId = 2; + * + *
+       * 动态id
+       * 
+ */ + public boolean hasHeroId() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional string heroId = 2; + * + *
+       * 动态id
+       * 
+ */ + public java.lang.String getHeroId() { + java.lang.Object ref = heroId_; + if (!(ref instanceof java.lang.String)) { + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + heroId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string heroId = 2; + * + *
+       * 动态id
+       * 
+ */ + public com.google.protobuf.ByteString + getHeroIdBytes() { + java.lang.Object ref = heroId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + heroId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string heroId = 2; + * + *
+       * 动态id
+       * 
+ */ + public Builder setHeroId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + heroId_ = value; + onChanged(); + return this; + } + /** + * optional string heroId = 2; + * + *
+       * 动态id
+       * 
+ */ + public Builder clearHeroId() { + bitField0_ = (bitField0_ & ~0x00000002); + heroId_ = getDefaultInstance().getHeroId(); + onChanged(); + return this; + } + /** + * optional string heroId = 2; + * + *
+       * 动态id
+       * 
+ */ + public Builder setHeroIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + heroId_ = value; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ViewHeroInfoRequest) + } + + static { + defaultInstance = new ViewHeroInfoRequest(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ViewHeroInfoRequest) + } + + public interface ViewHeroInfoResponseOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional .com.ljsd.jieling.protocols.Hero hero = 1; + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + boolean hasHero(); + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + com.ljsd.jieling.protocols.CommonProto.Hero getHero(); + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + com.ljsd.jieling.protocols.CommonProto.HeroOrBuilder getHeroOrBuilder(); + + // repeated .com.ljsd.jieling.protocols.Equip equip = 2; + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+     * 英雄所穿装备、法宝、魂印
+     * 
+ */ + java.util.List + getEquipList(); + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+     * 英雄所穿装备、法宝、魂印
+     * 
+ */ + com.ljsd.jieling.protocols.CommonProto.Equip getEquip(int index); + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+     * 英雄所穿装备、法宝、魂印
+     * 
+ */ + int getEquipCount(); + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+     * 英雄所穿装备、法宝、魂印
+     * 
+ */ + java.util.List + getEquipOrBuilderList(); + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+     * 英雄所穿装备、法宝、魂印
+     * 
+ */ + com.ljsd.jieling.protocols.CommonProto.EquipOrBuilder getEquipOrBuilder( + int index); + + // repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+     *属性信息
+     * 
+ */ + java.util.List + getSpecialEffectsList(); + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+     *属性信息
+     * 
+ */ + com.ljsd.jieling.protocols.CommonProto.SpecialEffects getSpecialEffects(int index); + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+     *属性信息
+     * 
+ */ + int getSpecialEffectsCount(); + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+     *属性信息
+     * 
+ */ + java.util.List + getSpecialEffectsOrBuilderList(); + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+     *属性信息
+     * 
+ */ + com.ljsd.jieling.protocols.CommonProto.SpecialEffectsOrBuilder getSpecialEffectsOrBuilder( + int index); + + // optional int32 force = 4; + /** + * optional int32 force = 4; + * + *
+     *战力
+     * 
+ */ + boolean hasForce(); + /** + * optional int32 force = 4; + * + *
+     *战力
+     * 
+ */ + int getForce(); + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ViewHeroInfoResponse} + */ + public static final class ViewHeroInfoResponse extends + com.google.protobuf.GeneratedMessage + implements ViewHeroInfoResponseOrBuilder { + // Use ViewHeroInfoResponse.newBuilder() to construct. + private ViewHeroInfoResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private ViewHeroInfoResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final ViewHeroInfoResponse defaultInstance; + public static ViewHeroInfoResponse getDefaultInstance() { + return defaultInstance; + } + + public ViewHeroInfoResponse getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ViewHeroInfoResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.ljsd.jieling.protocols.CommonProto.Hero.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = hero_.toBuilder(); + } + hero_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.Hero.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(hero_); + hero_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + case 18: { + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + equip_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + equip_.add(input.readMessage(com.ljsd.jieling.protocols.CommonProto.Equip.PARSER, extensionRegistry)); + break; + } + case 26: { + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + specialEffects_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000004; + } + specialEffects_.add(input.readMessage(com.ljsd.jieling.protocols.CommonProto.SpecialEffects.PARSER, extensionRegistry)); + break; + } + case 32: { + bitField0_ |= 0x00000002; + force_ = input.readInt32(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + equip_ = java.util.Collections.unmodifiableList(equip_); + } + if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + specialEffects_ = java.util.Collections.unmodifiableList(specialEffects_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ViewHeroInfoResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ViewHeroInfoResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse.class, com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public ViewHeroInfoResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ViewHeroInfoResponse(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional .com.ljsd.jieling.protocols.Hero hero = 1; + public static final int HERO_FIELD_NUMBER = 1; + private com.ljsd.jieling.protocols.CommonProto.Hero hero_; + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + public boolean hasHero() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.Hero getHero() { + return hero_; + } + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.HeroOrBuilder getHeroOrBuilder() { + return hero_; + } + + // repeated .com.ljsd.jieling.protocols.Equip equip = 2; + public static final int EQUIP_FIELD_NUMBER = 2; + private java.util.List equip_; + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+     * 英雄所穿装备、法宝、魂印
+     * 
+ */ + public java.util.List getEquipList() { + return equip_; + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+     * 英雄所穿装备、法宝、魂印
+     * 
+ */ + public java.util.List + getEquipOrBuilderList() { + return equip_; + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+     * 英雄所穿装备、法宝、魂印
+     * 
+ */ + public int getEquipCount() { + return equip_.size(); + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+     * 英雄所穿装备、法宝、魂印
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Equip getEquip(int index) { + return equip_.get(index); + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+     * 英雄所穿装备、法宝、魂印
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.EquipOrBuilder getEquipOrBuilder( + int index) { + return equip_.get(index); + } + + // repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + public static final int SPECIALEFFECTS_FIELD_NUMBER = 3; + private java.util.List specialEffects_; + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+     *属性信息
+     * 
+ */ + public java.util.List getSpecialEffectsList() { + return specialEffects_; + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+     *属性信息
+     * 
+ */ + public java.util.List + getSpecialEffectsOrBuilderList() { + return specialEffects_; + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+     *属性信息
+     * 
+ */ + public int getSpecialEffectsCount() { + return specialEffects_.size(); + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+     *属性信息
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.SpecialEffects getSpecialEffects(int index) { + return specialEffects_.get(index); + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+     *属性信息
+     * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.SpecialEffectsOrBuilder getSpecialEffectsOrBuilder( + int index) { + return specialEffects_.get(index); + } + + // optional int32 force = 4; + public static final int FORCE_FIELD_NUMBER = 4; + private int force_; + /** + * optional int32 force = 4; + * + *
+     *战力
+     * 
+ */ + public boolean hasForce() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 force = 4; + * + *
+     *战力
+     * 
+ */ + public int getForce() { + return force_; + } + + private void initFields() { + hero_ = com.ljsd.jieling.protocols.CommonProto.Hero.getDefaultInstance(); + equip_ = java.util.Collections.emptyList(); + specialEffects_ = java.util.Collections.emptyList(); + force_ = 0; + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeMessage(1, hero_); + } + for (int i = 0; i < equip_.size(); i++) { + output.writeMessage(2, equip_.get(i)); + } + for (int i = 0; i < specialEffects_.size(); i++) { + output.writeMessage(3, specialEffects_.get(i)); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(4, force_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, hero_); + } + for (int i = 0; i < equip_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, equip_.get(i)); + } + for (int i = 0; i < specialEffects_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, specialEffects_.get(i)); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(4, force_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code com.ljsd.jieling.protocols.ViewHeroInfoResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ViewHeroInfoResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ViewHeroInfoResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse.class, com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse.Builder.class); + } + + // Construct using com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getHeroFieldBuilder(); + getEquipFieldBuilder(); + getSpecialEffectsFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + if (heroBuilder_ == null) { + hero_ = com.ljsd.jieling.protocols.CommonProto.Hero.getDefaultInstance(); + } else { + heroBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + if (equipBuilder_ == null) { + equip_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + } else { + equipBuilder_.clear(); + } + if (specialEffectsBuilder_ == null) { + specialEffects_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + } else { + specialEffectsBuilder_.clear(); + } + force_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.ljsd.jieling.protocols.PlayerInfoProto.internal_static_com_ljsd_jieling_protocols_ViewHeroInfoResponse_descriptor; + } + + public com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse getDefaultInstanceForType() { + return com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse.getDefaultInstance(); + } + + public com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse build() { + com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse buildPartial() { + com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse result = new com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + if (heroBuilder_ == null) { + result.hero_ = hero_; + } else { + result.hero_ = heroBuilder_.build(); + } + if (equipBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002)) { + equip_ = java.util.Collections.unmodifiableList(equip_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.equip_ = equip_; + } else { + result.equip_ = equipBuilder_.build(); + } + if (specialEffectsBuilder_ == null) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { + specialEffects_ = java.util.Collections.unmodifiableList(specialEffects_); + bitField0_ = (bitField0_ & ~0x00000004); + } + result.specialEffects_ = specialEffects_; + } else { + result.specialEffects_ = specialEffectsBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000002; + } + result.force_ = force_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse) { + return mergeFrom((com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse other) { + if (other == com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse.getDefaultInstance()) return this; + if (other.hasHero()) { + mergeHero(other.getHero()); + } + if (equipBuilder_ == null) { + if (!other.equip_.isEmpty()) { + if (equip_.isEmpty()) { + equip_ = other.equip_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureEquipIsMutable(); + equip_.addAll(other.equip_); + } + onChanged(); + } + } else { + if (!other.equip_.isEmpty()) { + if (equipBuilder_.isEmpty()) { + equipBuilder_.dispose(); + equipBuilder_ = null; + equip_ = other.equip_; + bitField0_ = (bitField0_ & ~0x00000002); + equipBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getEquipFieldBuilder() : null; + } else { + equipBuilder_.addAllMessages(other.equip_); + } + } + } + if (specialEffectsBuilder_ == null) { + if (!other.specialEffects_.isEmpty()) { + if (specialEffects_.isEmpty()) { + specialEffects_ = other.specialEffects_; + bitField0_ = (bitField0_ & ~0x00000004); + } else { + ensureSpecialEffectsIsMutable(); + specialEffects_.addAll(other.specialEffects_); + } + onChanged(); + } + } else { + if (!other.specialEffects_.isEmpty()) { + if (specialEffectsBuilder_.isEmpty()) { + specialEffectsBuilder_.dispose(); + specialEffectsBuilder_ = null; + specialEffects_ = other.specialEffects_; + bitField0_ = (bitField0_ & ~0x00000004); + specialEffectsBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getSpecialEffectsFieldBuilder() : null; + } else { + specialEffectsBuilder_.addAllMessages(other.specialEffects_); + } + } + } + if (other.hasForce()) { + setForce(other.getForce()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.ljsd.jieling.protocols.PlayerInfoProto.ViewHeroInfoResponse) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional .com.ljsd.jieling.protocols.Hero hero = 1; + private com.ljsd.jieling.protocols.CommonProto.Hero hero_ = com.ljsd.jieling.protocols.CommonProto.Hero.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Hero, com.ljsd.jieling.protocols.CommonProto.Hero.Builder, com.ljsd.jieling.protocols.CommonProto.HeroOrBuilder> heroBuilder_; + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + public boolean hasHero() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.Hero getHero() { + if (heroBuilder_ == null) { + return hero_; + } else { + return heroBuilder_.getMessage(); + } + } + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + public Builder setHero(com.ljsd.jieling.protocols.CommonProto.Hero value) { + if (heroBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + hero_ = value; + onChanged(); + } else { + heroBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + public Builder setHero( + com.ljsd.jieling.protocols.CommonProto.Hero.Builder builderForValue) { + if (heroBuilder_ == null) { + hero_ = builderForValue.build(); + onChanged(); + } else { + heroBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + public Builder mergeHero(com.ljsd.jieling.protocols.CommonProto.Hero value) { + if (heroBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + hero_ != com.ljsd.jieling.protocols.CommonProto.Hero.getDefaultInstance()) { + hero_ = + com.ljsd.jieling.protocols.CommonProto.Hero.newBuilder(hero_).mergeFrom(value).buildPartial(); + } else { + hero_ = value; + } + onChanged(); + } else { + heroBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + public Builder clearHero() { + if (heroBuilder_ == null) { + hero_ = com.ljsd.jieling.protocols.CommonProto.Hero.getDefaultInstance(); + onChanged(); + } else { + heroBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.Hero.Builder getHeroBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getHeroFieldBuilder().getBuilder(); + } + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + public com.ljsd.jieling.protocols.CommonProto.HeroOrBuilder getHeroOrBuilder() { + if (heroBuilder_ != null) { + return heroBuilder_.getMessageOrBuilder(); + } else { + return hero_; + } + } + /** + * optional .com.ljsd.jieling.protocols.Hero hero = 1; + */ + private com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Hero, com.ljsd.jieling.protocols.CommonProto.Hero.Builder, com.ljsd.jieling.protocols.CommonProto.HeroOrBuilder> + getHeroFieldBuilder() { + if (heroBuilder_ == null) { + heroBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Hero, com.ljsd.jieling.protocols.CommonProto.Hero.Builder, com.ljsd.jieling.protocols.CommonProto.HeroOrBuilder>( + hero_, + getParentForChildren(), + isClean()); + hero_ = null; + } + return heroBuilder_; + } + + // repeated .com.ljsd.jieling.protocols.Equip equip = 2; + private java.util.List equip_ = + java.util.Collections.emptyList(); + private void ensureEquipIsMutable() { + if (!((bitField0_ & 0x00000002) == 0x00000002)) { + equip_ = new java.util.ArrayList(equip_); + bitField0_ |= 0x00000002; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Equip, com.ljsd.jieling.protocols.CommonProto.Equip.Builder, com.ljsd.jieling.protocols.CommonProto.EquipOrBuilder> equipBuilder_; + + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public java.util.List getEquipList() { + if (equipBuilder_ == null) { + return java.util.Collections.unmodifiableList(equip_); + } else { + return equipBuilder_.getMessageList(); + } + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public int getEquipCount() { + if (equipBuilder_ == null) { + return equip_.size(); + } else { + return equipBuilder_.getCount(); + } + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Equip getEquip(int index) { + if (equipBuilder_ == null) { + return equip_.get(index); + } else { + return equipBuilder_.getMessage(index); + } + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public Builder setEquip( + int index, com.ljsd.jieling.protocols.CommonProto.Equip value) { + if (equipBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureEquipIsMutable(); + equip_.set(index, value); + onChanged(); + } else { + equipBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public Builder setEquip( + int index, com.ljsd.jieling.protocols.CommonProto.Equip.Builder builderForValue) { + if (equipBuilder_ == null) { + ensureEquipIsMutable(); + equip_.set(index, builderForValue.build()); + onChanged(); + } else { + equipBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public Builder addEquip(com.ljsd.jieling.protocols.CommonProto.Equip value) { + if (equipBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureEquipIsMutable(); + equip_.add(value); + onChanged(); + } else { + equipBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public Builder addEquip( + int index, com.ljsd.jieling.protocols.CommonProto.Equip value) { + if (equipBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureEquipIsMutable(); + equip_.add(index, value); + onChanged(); + } else { + equipBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public Builder addEquip( + com.ljsd.jieling.protocols.CommonProto.Equip.Builder builderForValue) { + if (equipBuilder_ == null) { + ensureEquipIsMutable(); + equip_.add(builderForValue.build()); + onChanged(); + } else { + equipBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public Builder addEquip( + int index, com.ljsd.jieling.protocols.CommonProto.Equip.Builder builderForValue) { + if (equipBuilder_ == null) { + ensureEquipIsMutable(); + equip_.add(index, builderForValue.build()); + onChanged(); + } else { + equipBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public Builder addAllEquip( + java.lang.Iterable values) { + if (equipBuilder_ == null) { + ensureEquipIsMutable(); + super.addAll(values, equip_); + onChanged(); + } else { + equipBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public Builder clearEquip() { + if (equipBuilder_ == null) { + equip_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + } else { + equipBuilder_.clear(); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public Builder removeEquip(int index) { + if (equipBuilder_ == null) { + ensureEquipIsMutable(); + equip_.remove(index); + onChanged(); + } else { + equipBuilder_.remove(index); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Equip.Builder getEquipBuilder( + int index) { + return getEquipFieldBuilder().getBuilder(index); + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.EquipOrBuilder getEquipOrBuilder( + int index) { + if (equipBuilder_ == null) { + return equip_.get(index); } else { + return equipBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public java.util.List + getEquipOrBuilderList() { + if (equipBuilder_ != null) { + return equipBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(equip_); + } + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Equip.Builder addEquipBuilder() { + return getEquipFieldBuilder().addBuilder( + com.ljsd.jieling.protocols.CommonProto.Equip.getDefaultInstance()); + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.Equip.Builder addEquipBuilder( + int index) { + return getEquipFieldBuilder().addBuilder( + index, com.ljsd.jieling.protocols.CommonProto.Equip.getDefaultInstance()); + } + /** + * repeated .com.ljsd.jieling.protocols.Equip equip = 2; + * + *
+       * 英雄所穿装备、法宝、魂印
+       * 
+ */ + public java.util.List + getEquipBuilderList() { + return getEquipFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Equip, com.ljsd.jieling.protocols.CommonProto.Equip.Builder, com.ljsd.jieling.protocols.CommonProto.EquipOrBuilder> + getEquipFieldBuilder() { + if (equipBuilder_ == null) { + equipBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.Equip, com.ljsd.jieling.protocols.CommonProto.Equip.Builder, com.ljsd.jieling.protocols.CommonProto.EquipOrBuilder>( + equip_, + ((bitField0_ & 0x00000002) == 0x00000002), + getParentForChildren(), + isClean()); + equip_ = null; + } + return equipBuilder_; + } + + // repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + private java.util.List specialEffects_ = + java.util.Collections.emptyList(); + private void ensureSpecialEffectsIsMutable() { + if (!((bitField0_ & 0x00000004) == 0x00000004)) { + specialEffects_ = new java.util.ArrayList(specialEffects_); + bitField0_ |= 0x00000004; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.SpecialEffects, com.ljsd.jieling.protocols.CommonProto.SpecialEffects.Builder, com.ljsd.jieling.protocols.CommonProto.SpecialEffectsOrBuilder> specialEffectsBuilder_; + + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public java.util.List getSpecialEffectsList() { + if (specialEffectsBuilder_ == null) { + return java.util.Collections.unmodifiableList(specialEffects_); + } else { + return specialEffectsBuilder_.getMessageList(); + } + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public int getSpecialEffectsCount() { + if (specialEffectsBuilder_ == null) { + return specialEffects_.size(); + } else { + return specialEffectsBuilder_.getCount(); + } + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.SpecialEffects getSpecialEffects(int index) { + if (specialEffectsBuilder_ == null) { + return specialEffects_.get(index); + } else { + return specialEffectsBuilder_.getMessage(index); + } + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public Builder setSpecialEffects( + int index, com.ljsd.jieling.protocols.CommonProto.SpecialEffects value) { + if (specialEffectsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureSpecialEffectsIsMutable(); + specialEffects_.set(index, value); + onChanged(); + } else { + specialEffectsBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public Builder setSpecialEffects( + int index, com.ljsd.jieling.protocols.CommonProto.SpecialEffects.Builder builderForValue) { + if (specialEffectsBuilder_ == null) { + ensureSpecialEffectsIsMutable(); + specialEffects_.set(index, builderForValue.build()); + onChanged(); + } else { + specialEffectsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public Builder addSpecialEffects(com.ljsd.jieling.protocols.CommonProto.SpecialEffects value) { + if (specialEffectsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureSpecialEffectsIsMutable(); + specialEffects_.add(value); + onChanged(); + } else { + specialEffectsBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public Builder addSpecialEffects( + int index, com.ljsd.jieling.protocols.CommonProto.SpecialEffects value) { + if (specialEffectsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureSpecialEffectsIsMutable(); + specialEffects_.add(index, value); + onChanged(); + } else { + specialEffectsBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public Builder addSpecialEffects( + com.ljsd.jieling.protocols.CommonProto.SpecialEffects.Builder builderForValue) { + if (specialEffectsBuilder_ == null) { + ensureSpecialEffectsIsMutable(); + specialEffects_.add(builderForValue.build()); + onChanged(); + } else { + specialEffectsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public Builder addSpecialEffects( + int index, com.ljsd.jieling.protocols.CommonProto.SpecialEffects.Builder builderForValue) { + if (specialEffectsBuilder_ == null) { + ensureSpecialEffectsIsMutable(); + specialEffects_.add(index, builderForValue.build()); + onChanged(); + } else { + specialEffectsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public Builder addAllSpecialEffects( + java.lang.Iterable values) { + if (specialEffectsBuilder_ == null) { + ensureSpecialEffectsIsMutable(); + super.addAll(values, specialEffects_); + onChanged(); + } else { + specialEffectsBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public Builder clearSpecialEffects() { + if (specialEffectsBuilder_ == null) { + specialEffects_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + } else { + specialEffectsBuilder_.clear(); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public Builder removeSpecialEffects(int index) { + if (specialEffectsBuilder_ == null) { + ensureSpecialEffectsIsMutable(); + specialEffects_.remove(index); + onChanged(); + } else { + specialEffectsBuilder_.remove(index); + } + return this; + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.SpecialEffects.Builder getSpecialEffectsBuilder( + int index) { + return getSpecialEffectsFieldBuilder().getBuilder(index); + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.SpecialEffectsOrBuilder getSpecialEffectsOrBuilder( + int index) { + if (specialEffectsBuilder_ == null) { + return specialEffects_.get(index); } else { + return specialEffectsBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public java.util.List + getSpecialEffectsOrBuilderList() { + if (specialEffectsBuilder_ != null) { + return specialEffectsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(specialEffects_); + } + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.SpecialEffects.Builder addSpecialEffectsBuilder() { + return getSpecialEffectsFieldBuilder().addBuilder( + com.ljsd.jieling.protocols.CommonProto.SpecialEffects.getDefaultInstance()); + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public com.ljsd.jieling.protocols.CommonProto.SpecialEffects.Builder addSpecialEffectsBuilder( + int index) { + return getSpecialEffectsFieldBuilder().addBuilder( + index, com.ljsd.jieling.protocols.CommonProto.SpecialEffects.getDefaultInstance()); + } + /** + * repeated .com.ljsd.jieling.protocols.SpecialEffects SpecialEffects = 3; + * + *
+       *属性信息
+       * 
+ */ + public java.util.List + getSpecialEffectsBuilderList() { + return getSpecialEffectsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.SpecialEffects, com.ljsd.jieling.protocols.CommonProto.SpecialEffects.Builder, com.ljsd.jieling.protocols.CommonProto.SpecialEffectsOrBuilder> + getSpecialEffectsFieldBuilder() { + if (specialEffectsBuilder_ == null) { + specialEffectsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + com.ljsd.jieling.protocols.CommonProto.SpecialEffects, com.ljsd.jieling.protocols.CommonProto.SpecialEffects.Builder, com.ljsd.jieling.protocols.CommonProto.SpecialEffectsOrBuilder>( + specialEffects_, + ((bitField0_ & 0x00000004) == 0x00000004), + getParentForChildren(), + isClean()); + specialEffects_ = null; + } + return specialEffectsBuilder_; + } + + // optional int32 force = 4; + private int force_ ; + /** + * optional int32 force = 4; + * + *
+       *战力
+       * 
+ */ + public boolean hasForce() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional int32 force = 4; + * + *
+       *战力
+       * 
+ */ + public int getForce() { + return force_; + } + /** + * optional int32 force = 4; + * + *
+       *战力
+       * 
+ */ + public Builder setForce(int value) { + bitField0_ |= 0x00000008; + force_ = value; + onChanged(); + return this; + } + /** + * optional int32 force = 4; + * + *
+       *战力
+       * 
+ */ + public Builder clearForce() { + bitField0_ = (bitField0_ & ~0x00000008); + force_ = 0; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ViewHeroInfoResponse) + } + + static { + defaultInstance = new ViewHeroInfoResponse(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ViewHeroInfoResponse) + } + private static com.google.protobuf.Descriptors.Descriptor internal_static_com_ljsd_jieling_protocols_ErrorMsgResponse_descriptor; private static @@ -84606,10 +86887,10 @@ public final class PlayerInfoProto { com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_com_ljsd_jieling_protocols_UpdateBagIndication_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor - internal_static_com_ljsd_jieling_protocols_modifyHeadFrameRequest_descriptor; + internal_static_com_ljsd_jieling_protocols_ModifyHeadRequest_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_com_ljsd_jieling_protocols_modifyHeadFrameRequest_fieldAccessorTable; + internal_static_com_ljsd_jieling_protocols_ModifyHeadRequest_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor internal_static_com_ljsd_jieling_protocols_blessResponse_descriptor; private static @@ -84845,6 +87126,16 @@ public final class PlayerInfoProto { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_com_ljsd_jieling_protocols_MailDelRequest_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_com_ljsd_jieling_protocols_ViewHeroInfoRequest_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_com_ljsd_jieling_protocols_ViewHeroInfoRequest_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_com_ljsd_jieling_protocols_ViewHeroInfoResponse_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_com_ljsd_jieling_protocols_ViewHeroInfoResponse_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -85031,98 +87322,104 @@ public final class PlayerInfoProto { "\003(\0132$.com.ljsd.jieling.protocols.ItemInf" + "o\"S\n\023UpdateBagIndication\022\014\n\004type\030\001 \001(\005\022." + "\n\004item\030\002 \003(\0132 .com.ljsd.jieling.protocol" + - "s.Item\"-\n\026modifyHeadFrameRequest\022\023\n\013head" + - "FrameId\030\001 \001(\005\"\336\002\n\rblessResponse\022:\n\tfixRe" + - "ward\030\001 \003(\0132\'.com.ljsd.jieling.protocols.", - "blessReward\022=\n\014legendReward\030\002 \003(\0132\'.com." + - "ljsd.jieling.protocols.blessReward\022>\n\rsu" + - "premeReward\030\003 \003(\0132\'.com.ljsd.jieling.pro" + - "tocols.blessReward\022<\n\013countReward\030\004 \003(\0132" + - "\'.com.ljsd.jieling.protocols.blessReward" + - "\022;\n\nrewardView\030\005 \003(\0132\'.com.ljsd.jieling." + - "protocols.blessReward\022\027\n\017lastRefreshTime" + - "\030\006 \001(\005\"%\n\020blessSaveRequest\022\021\n\trewardIds\030" + - "\001 \003(\005\"(\n\022blessChooseRequest\022\022\n\nlocationI" + - "d\030\001 \001(\005\"_\n\023blessChooseResponse\0220\n\006reward", - "\030\001 \001(\0132 .com.ljsd.jieling.protocols.Drop" + - "\022\026\n\016chooseRewardId\030\002 \001(\005\"I\n\014blessRefresh" + - "\0229\n\006reward\030\001 \001(\0132).com.ljsd.jieling.prot" + - "ocols.blessResponse\"Q\n\025storeUpdateIndica" + - "tion\0228\n\tstoreInfo\030\001 \003(\0132%.com.ljsd.jieli" + - "ng.protocols.StoreInfo\"%\n\tLockEquip\022\n\n\002i" + - "d\030\001 \003(\t\022\014\n\004type\030\002 \001(\005\"r\n\027ActivityUpateIn" + - "dication\022>\n\014activityInfo\030\001 \003(\0132(.com.ljs" + - "d.jieling.protocols.ActivityInfo\022\027\n\017clos" + - "eActivityId\030\002 \003(\005\";\n\027GetForceRankInfoReq", - "uest\022\014\n\004page\030\001 \001(\005\022\022\n\nactiviteId\030\002 \001(\005\"{" + - "\n\030GetForceRankInfoResponse\022>\n\014useForceIn" + - "fo\030\001 \003(\0132(.com.ljsd.jieling.protocols.Us" + - "eForceInfo\022\017\n\007myForce\030\002 \001(\005\022\016\n\006myRank\030\003 " + - "\001(\005\"a\n\037ActivityUpateProgressIndication\022>" + - "\n\014activityInfo\030\001 \002(\0132(.com.ljsd.jieling." + - "protocols.ActivityInfo\"*\n\024GetExpertInfoR" + - "equest\022\022\n\nactiviteId\030\001 \001(\005\"p\n\025GetExpertI" + - "nfoResponse\0226\n\006expert\030\001 \003(\0132&.com.ljsd.j" + - "ieling.protocols.ExpertInfo\022\017\n\007myScore\030\002", - " \001(\005\022\016\n\006myRank\030\003 \001(\005\"!\n\rSignInRequest\022\020\n" + - "\010dayIndex\030\001 \001(\005\"@\n\016SignInResponse\022.\n\004dro" + - "p\030\001 \001(\0132 .com.ljsd.jieling.protocols.Dro" + - "p\"?\n\033GetPlayerOneTeamInfoRequest\022\020\n\010play" + - "erId\030\001 \001(\005\022\016\n\006teamId\030\002 \001(\005\"Y\n\034GetPlayerO" + - "neTeamInfoResponse\0229\n\010teamInfo\030\001 \001(\0132\'.c" + - "om.ljsd.jieling.protocols.TeamOneInfo\"O\n" + - "\035TakeSenvenScoreRewardResponse\022.\n\004drop\030\001" + - " \001(\0132 .com.ljsd.jieling.protocols.Drop\"\"" + - "\n\022UpdateStateRequest\022\014\n\004type\030\001 \001(\005\"5\n\027Up", - "dateUserExpIndicaiton\022\r\n\005level\030\001 \001(\005\022\013\n\003" + - "exp\030\002 \001(\005\"6\n\037UpdateSecretBoxSeasonIndica" + - "tion\022\023\n\013newSeasonId\030\001 \001(\005\"\033\n\031GetMonsterR" + - "ankInfoRequest\"{\n\032GetMonsterRankInfoResp" + - "onse\022<\n\007monster\030\001 \003(\0132+.com.ljsd.jieling" + - ".protocols.MonsterRankInfo\022\017\n\007myScore\030\002 " + - "\001(\005\022\016\n\006myRank\030\003 \001(\005\"-\n\031PlayerBackCInfoIn" + - "dication\022\020\n\010nickName\030\001 \001(\t\"*\n\026UpdatePhon" + - "einfoRequest\022\020\n\010phoneNum\030\001 \001(\t\"(\n\027Update" + - "PhoneinfoResponse\022\r\n\005state\030\001 \001(\005\"\027\n\025GetP", - "honeRewardRequest\"H\n\026GetPhoneRewardRespo" + - "nse\022.\n\004drop\030\001 \001(\0132 .com.ljsd.jieling.pro" + - "tocols.Drop\"#\n\022QuestionIndication\022\r\n\005sta" + - "te\030\001 \001(\005\"\024\n\022GetQuestionRequest\"\226\001\n\023GetQu" + - "estionResponse\022\n\n\002id\030\001 \001(\t\022\020\n\010questDes\030\002" + - " \001(\t\022\r\n\005start\030\003 \001(\t\022\017\n\007endtime\030\004 \001(\t\022A\n\014" + - "questOptions\030\005 \003(\0132+.com.ljsd.jieling.pr" + - "otocols.QuestionOptions\"(\n\025upDataQuestio" + - "nRequest\022\017\n\007options\030\001 \003(\t\"(\n\026upDataQuest" + - "ionResponse\022\016\n\006result\030\001 \001(\005\"\013\n\tBloodRank", - "\"!\n\022ExchangeCdkRequest\022\013\n\003key\030\001 \001(\t\"0\n\035N" + - "otifyPaySuccessfulIndicaiton\022\017\n\007goodsId\030" + - "\001 \001(\005\"V\n\023DirectBuyIndication\022\017\n\007goodsId\030" + - "\001 \001(\005\022.\n\004drop\030\002 \001(\0132 .com.ljsd.jieling.p" + - "rotocols.Drop\"=\n\027RefreshLuckWheelRequest" + - "\022\022\n\nactivityId\030\001 \001(\005\022\016\n\006isFree\030\002 \001(\010\"`\n\030" + - "RefreshLuckWheelResponse\022D\n\010posInfos\030\001 \003" + + "s.Item\"1\n\021ModifyHeadRequest\022\016\n\006headId\030\001 " + + "\001(\005\022\014\n\004type\030\002 \001(\005\"\336\002\n\rblessResponse\022:\n\tf" + + "ixReward\030\001 \003(\0132\'.com.ljsd.jieling.protoc", + "ols.blessReward\022=\n\014legendReward\030\002 \003(\0132\'." + + "com.ljsd.jieling.protocols.blessReward\022>" + + "\n\rsupremeReward\030\003 \003(\0132\'.com.ljsd.jieling" + + ".protocols.blessReward\022<\n\013countReward\030\004 " + + "\003(\0132\'.com.ljsd.jieling.protocols.blessRe" + + "ward\022;\n\nrewardView\030\005 \003(\0132\'.com.ljsd.jiel" + + "ing.protocols.blessReward\022\027\n\017lastRefresh" + + "Time\030\006 \001(\005\"%\n\020blessSaveRequest\022\021\n\treward" + + "Ids\030\001 \003(\005\"(\n\022blessChooseRequest\022\022\n\nlocat" + + "ionId\030\001 \001(\005\"_\n\023blessChooseResponse\0220\n\006re", + "ward\030\001 \001(\0132 .com.ljsd.jieling.protocols." + + "Drop\022\026\n\016chooseRewardId\030\002 \001(\005\"I\n\014blessRef" + + "resh\0229\n\006reward\030\001 \001(\0132).com.ljsd.jieling." + + "protocols.blessResponse\"Q\n\025storeUpdateIn" + + "dication\0228\n\tstoreInfo\030\001 \003(\0132%.com.ljsd.j" + + "ieling.protocols.StoreInfo\"%\n\tLockEquip\022" + + "\n\n\002id\030\001 \003(\t\022\014\n\004type\030\002 \001(\005\"r\n\027ActivityUpa" + + "teIndication\022>\n\014activityInfo\030\001 \003(\0132(.com" + + ".ljsd.jieling.protocols.ActivityInfo\022\027\n\017" + + "closeActivityId\030\002 \003(\005\";\n\027GetForceRankInf", + "oRequest\022\014\n\004page\030\001 \001(\005\022\022\n\nactiviteId\030\002 \001" + + "(\005\"{\n\030GetForceRankInfoResponse\022>\n\014useFor" + + "ceInfo\030\001 \003(\0132(.com.ljsd.jieling.protocol" + + "s.UseForceInfo\022\017\n\007myForce\030\002 \001(\005\022\016\n\006myRan" + + "k\030\003 \001(\005\"a\n\037ActivityUpateProgressIndicati" + + "on\022>\n\014activityInfo\030\001 \002(\0132(.com.ljsd.jiel" + + "ing.protocols.ActivityInfo\"*\n\024GetExpertI" + + "nfoRequest\022\022\n\nactiviteId\030\001 \001(\005\"p\n\025GetExp" + + "ertInfoResponse\0226\n\006expert\030\001 \003(\0132&.com.lj" + + "sd.jieling.protocols.ExpertInfo\022\017\n\007mySco", + "re\030\002 \001(\005\022\016\n\006myRank\030\003 \001(\005\"!\n\rSignInReques" + + "t\022\020\n\010dayIndex\030\001 \001(\005\"@\n\016SignInResponse\022.\n" + + "\004drop\030\001 \001(\0132 .com.ljsd.jieling.protocols" + + ".Drop\"?\n\033GetPlayerOneTeamInfoRequest\022\020\n\010" + + "playerId\030\001 \001(\005\022\016\n\006teamId\030\002 \001(\005\"Y\n\034GetPla" + + "yerOneTeamInfoResponse\0229\n\010teamInfo\030\001 \001(\013" + + "2\'.com.ljsd.jieling.protocols.TeamOneInf" + + "o\"O\n\035TakeSenvenScoreRewardResponse\022.\n\004dr" + + "op\030\001 \001(\0132 .com.ljsd.jieling.protocols.Dr" + + "op\"\"\n\022UpdateStateRequest\022\014\n\004type\030\001 \001(\005\"5", + "\n\027UpdateUserExpIndicaiton\022\r\n\005level\030\001 \001(\005" + + "\022\013\n\003exp\030\002 \001(\005\"6\n\037UpdateSecretBoxSeasonIn" + + "dication\022\023\n\013newSeasonId\030\001 \001(\005\"\033\n\031GetMons" + + "terRankInfoRequest\"{\n\032GetMonsterRankInfo" + + "Response\022<\n\007monster\030\001 \003(\0132+.com.ljsd.jie" + + "ling.protocols.MonsterRankInfo\022\017\n\007myScor" + + "e\030\002 \001(\005\022\016\n\006myRank\030\003 \001(\005\"-\n\031PlayerBackCIn" + + "foIndication\022\020\n\010nickName\030\001 \001(\t\"*\n\026Update" + + "PhoneinfoRequest\022\020\n\010phoneNum\030\001 \001(\t\"(\n\027Up" + + "datePhoneinfoResponse\022\r\n\005state\030\001 \001(\005\"\027\n\025", + "GetPhoneRewardRequest\"H\n\026GetPhoneRewardR" + + "esponse\022.\n\004drop\030\001 \001(\0132 .com.ljsd.jieling" + + ".protocols.Drop\"#\n\022QuestionIndication\022\r\n" + + "\005state\030\001 \001(\005\"\024\n\022GetQuestionRequest\"\226\001\n\023G" + + "etQuestionResponse\022\n\n\002id\030\001 \001(\t\022\020\n\010questD" + + "es\030\002 \001(\t\022\r\n\005start\030\003 \001(\t\022\017\n\007endtime\030\004 \001(\t" + + "\022A\n\014questOptions\030\005 \003(\0132+.com.ljsd.jielin" + + "g.protocols.QuestionOptions\"(\n\025upDataQue" + + "stionRequest\022\017\n\007options\030\001 \003(\t\"(\n\026upDataQ" + + "uestionResponse\022\016\n\006result\030\001 \001(\005\"\013\n\tBlood", + "Rank\"!\n\022ExchangeCdkRequest\022\013\n\003key\030\001 \001(\t\"" + + "0\n\035NotifyPaySuccessfulIndicaiton\022\017\n\007good" + + "sId\030\001 \001(\005\"V\n\023DirectBuyIndication\022\017\n\007good" + + "sId\030\001 \001(\005\022.\n\004drop\030\002 \001(\0132 .com.ljsd.jieli" + + "ng.protocols.Drop\"=\n\027RefreshLuckWheelReq" + + "uest\022\022\n\nactivityId\030\001 \001(\005\022\016\n\006isFree\030\002 \001(\010" + + "\"`\n\030RefreshLuckWheelResponse\022D\n\010posInfos" + + "\030\001 \003(\01322.com.ljsd.jieling.protocols.Luck" + + "WheelRewardPosInfo\"E\n\035GetLuckWheelRandRe" + + "wardRequest\022\022\n\nactivityId\030\001 \001(\005\022\020\n\010repea", + "ted\030\002 \001(\010\"\252\001\n\036GetLuckWheelRandRewardResp" + + "onse\022\022\n\nactivityId\030\001 \001(\005\022D\n\010posInfos\030\002 \003" + "(\01322.com.ljsd.jieling.protocols.LuckWhee" + - "lRewardPosInfo\"E\n\035GetLuckWheelRandReward" + - "Request\022\022\n\nactivityId\030\001 \001(\005\022\020\n\010repeated\030", - "\002 \001(\010\"\252\001\n\036GetLuckWheelRandRewardResponse" + - "\022\022\n\nactivityId\030\001 \001(\005\022D\n\010posInfos\030\002 \003(\01322" + - ".com.ljsd.jieling.protocols.LuckWheelRew" + - "ardPosInfo\022.\n\004drop\030\003 \001(\0132 .com.ljsd.jiel" + - "ing.protocols.Drop\"\250\001\n\023LuckWheelIndicati" + - "on\022D\n\010posInfos\030\001 \003(\01322.com.ljsd.jieling." + - "protocols.LuckWheelRewardPosInfo\022K\n\017posI" + - "nfosAdvance\030\002 \003(\01322.com.ljsd.jieling.pro" + - "tocols.LuckWheelRewardPosInfo\"\242\001\n\030GetMai" + - "nLevelInfoResponse\022\017\n\007fightId\030\001 \001(\005\022\r\n\005s", - "tate\030\002 \001(\005\022\020\n\010duration\030\003 \001(\005\022T\n\027adventur" + - "eBossSimpleInfo\030\004 \003(\01323.com.ljsd.jieling" + - ".protocols.AdventureBossSimpleInfo\"-\n\034Qu" + - "ickBuyTreasureLevelRequest\022\r\n\005level\030\001 \001(" + - "\005\"S\n\031TreasureRefreshIndication\0226\n\005tasks\030" + - "\001 \003(\0132\'.com.ljsd.jieling.protocols.Refre" + - "shTask\"*\n\031TreasureLevelUpIndication\022\r\n\005l" + - "evel\030\001 \001(\005\" \n\016MailDelRequest\022\016\n\006mailId\030\001" + - " \003(\tB\002H\001" + "lRewardPosInfo\022.\n\004drop\030\003 \001(\0132 .com.ljsd." + + "jieling.protocols.Drop\"\250\001\n\023LuckWheelIndi" + + "cation\022D\n\010posInfos\030\001 \003(\01322.com.ljsd.jiel" + + "ing.protocols.LuckWheelRewardPosInfo\022K\n\017" + + "posInfosAdvance\030\002 \003(\01322.com.ljsd.jieling" + + ".protocols.LuckWheelRewardPosInfo\"\242\001\n\030Ge" + + "tMainLevelInfoResponse\022\017\n\007fightId\030\001 \001(\005\022", + "\r\n\005state\030\002 \001(\005\022\020\n\010duration\030\003 \001(\005\022T\n\027adve" + + "ntureBossSimpleInfo\030\004 \003(\01323.com.ljsd.jie" + + "ling.protocols.AdventureBossSimpleInfo\"-" + + "\n\034QuickBuyTreasureLevelRequest\022\r\n\005level\030" + + "\001 \001(\005\"S\n\031TreasureRefreshIndication\0226\n\005ta" + + "sks\030\001 \003(\0132\'.com.ljsd.jieling.protocols.R" + + "efreshTask\"*\n\031TreasureLevelUpIndication\022" + + "\r\n\005level\030\001 \001(\005\" \n\016MailDelRequest\022\016\n\006mail" + + "Id\030\001 \003(\t\"8\n\023ViewHeroInfoRequest\022\021\n\ttarge" + + "tUid\030\001 \001(\005\022\016\n\006heroId\030\002 \001(\t\"\313\001\n\024ViewHeroI", + "nfoResponse\022.\n\004hero\030\001 \001(\0132 .com.ljsd.jie" + + "ling.protocols.Hero\0220\n\005equip\030\002 \003(\0132!.com" + + ".ljsd.jieling.protocols.Equip\022B\n\016Special" + + "Effects\030\003 \003(\0132*.com.ljsd.jieling.protoco" + + "ls.SpecialEffects\022\r\n\005force\030\004 \001(\005B\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -85573,12 +87870,12 @@ public final class PlayerInfoProto { com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_UpdateBagIndication_descriptor, new java.lang.String[] { "Type", "Item", }); - internal_static_com_ljsd_jieling_protocols_modifyHeadFrameRequest_descriptor = + internal_static_com_ljsd_jieling_protocols_ModifyHeadRequest_descriptor = getDescriptor().getMessageTypes().get(74); - internal_static_com_ljsd_jieling_protocols_modifyHeadFrameRequest_fieldAccessorTable = new + internal_static_com_ljsd_jieling_protocols_ModifyHeadRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_com_ljsd_jieling_protocols_modifyHeadFrameRequest_descriptor, - new java.lang.String[] { "HeadFrameId", }); + internal_static_com_ljsd_jieling_protocols_ModifyHeadRequest_descriptor, + new java.lang.String[] { "HeadId", "Type", }); internal_static_com_ljsd_jieling_protocols_blessResponse_descriptor = getDescriptor().getMessageTypes().get(75); internal_static_com_ljsd_jieling_protocols_blessResponse_fieldAccessorTable = new @@ -85861,6 +88158,18 @@ public final class PlayerInfoProto { com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_MailDelRequest_descriptor, new java.lang.String[] { "MailId", }); + internal_static_com_ljsd_jieling_protocols_ViewHeroInfoRequest_descriptor = + getDescriptor().getMessageTypes().get(122); + internal_static_com_ljsd_jieling_protocols_ViewHeroInfoRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_com_ljsd_jieling_protocols_ViewHeroInfoRequest_descriptor, + new java.lang.String[] { "TargetUid", "HeroId", }); + internal_static_com_ljsd_jieling_protocols_ViewHeroInfoResponse_descriptor = + getDescriptor().getMessageTypes().get(123); + internal_static_com_ljsd_jieling_protocols_ViewHeroInfoResponse_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_com_ljsd_jieling_protocols_ViewHeroInfoResponse_descriptor, + new java.lang.String[] { "Hero", "Equip", "SpecialEffects", "Force", }); return null; } }; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 547dd8c70..db4cfd652 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -1765,7 +1765,7 @@ public class MapLogic { if (hero == null) { continue; } - heroForces += HeroLogic.getInstance().calHeoForce(user, hero, true); + heroForces += HeroLogic.getInstance().calHeoForce(user, hero); crossInfo.getHeroIds().add(hero.getTemplateId()); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/player/ViewHeroInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/player/ViewHeroInfoHandler.java new file mode 100644 index 000000000..f35788f59 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/player/ViewHeroInfoHandler.java @@ -0,0 +1,19 @@ +package com.ljsd.jieling.handler.player; + +import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.logic.player.PlayerLogic; +import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.protocols.MessageTypeProto; +import com.ljsd.jieling.protocols.PlayerInfoProto; + +public class ViewHeroInfoHandler extends BaseHandler { + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.VIEW_HERO_INFO_REQUEST; + } + + @Override + public void processWithProto(ISession iSession, PlayerInfoProto.ViewHeroInfoRequest proto) throws Exception { + PlayerLogic.getInstance().viewHeroInfo(iSession,proto.getTargetUid(),proto.getHeroId()); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java index 13acfd3e9..477de868f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java @@ -68,7 +68,7 @@ public class BloodLogic { heroAttributeMap = CombatLogic.getInstance().bufferOneHeroAttrAfterEat(heroAttributeMap,buffInfo[i]); } } - heroAllAttribute.put(heroInfo.getHeroId(), new FamilyHeroInfo(hero.getTemplateId(), hero.getLevel(), heroAttributeMap)); + heroAllAttribute.put(heroInfo.getHeroId(), new FamilyHeroInfo(hero.getTemplateId(), hero.getLevel(),hero.getStar(), heroAttributeMap)); } return heroAllAttribute; } @@ -91,7 +91,6 @@ public class BloodLogic { /** * 战斗数据组装 - * @param user * @param heroInfo * @return */ @@ -109,12 +108,11 @@ public class BloodLogic { .build(); heroDefendFightInfos.add(heroFightInfo); } - CommonProto.FightTeamInfo fightDefendTeamInfo = CommonProto.FightTeamInfo. + return CommonProto.FightTeamInfo. newBuilder() .addAllFightUnitList(heroDefendFightInfos) .setTeamSkillList(pokmanSkill) .build(); - return fightDefendTeamInfo; } /** diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyHeroInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyHeroInfo.java index df26181a5..80466edb0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyHeroInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyHeroInfo.java @@ -7,6 +7,7 @@ public class FamilyHeroInfo { private int templeteId; private int level; + private int star; private Map attribute; public int getTempleteId() { @@ -17,6 +18,10 @@ public class FamilyHeroInfo { return level; } + public int getStar() { + return star; + } + public Map getAttribute() { return attribute; } @@ -33,10 +38,11 @@ public class FamilyHeroInfo { this.attribute = attribute; } - public FamilyHeroInfo(int templeteId, int level, Map attribute) { + public FamilyHeroInfo(int templeteId, int level, int star,Map attribute) { this.templeteId = templeteId; this.level = level; this.attribute = attribute; + this.star = star; } public FamilyHeroInfo() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index 388c84b36..949f64f7e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -101,12 +101,17 @@ public class GuildFightLogic { public static void viewDefendDetailInfo(ISession session, int uid,int gid ,MessageTypeProto.MessageType messageType) throws Exception { FamilyFightInfo fightInfo = RedisUtil.getInstence().getMapEntry(RedisKey.FAMILY_FIGHT, String.valueOf(gid), String.valueOf(uid), FamilyFightInfo.class); - CommonProto.Team.Builder team = CommonProto.Team.newBuilder(); CommonProto.TeamOneTeamInfo.Builder oneInfo = CommonProto.TeamOneTeamInfo.newBuilder(); if(fightInfo!=null){ for(Map.Entry entry:fightInfo.getHeroAttribute().entrySet()){ - int templateId = entry.getValue().getTempleteId(); - team.addHeroTid(templateId); + FamilyHeroInfo familyHeroInfo = entry.getValue(); + oneInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder() + .setHeroid(entry.getKey()) + .setHeroTid(familyHeroInfo.getTempleteId()) + .setStar(familyHeroInfo.getStar()) + .setLevel(familyHeroInfo.getLevel()) + .build() + ); Map attribute = entry.getValue().getAttribute(); if(status==3){ int remainHp = attribute.get(HeroAttributeEnum.CurHP.getPropertyId())*100/attribute.get(HeroAttributeEnum.Hp.getPropertyId()); @@ -123,7 +128,8 @@ public class GuildFightLogic { teamPosHeroInfos = teamPosManager.getTeamPosForHero().get(1); } for(TeamPosHeroInfo heroInfo:teamPosHeroInfos){ - team.addHeroTid(user.getHeroManager().getHero(heroInfo.getHeroId()).getTemplateId()); + Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId()); + oneInfo.addTeam(CBean2Proto.getSimpleTeamInfoByHero(hero)); } int force = HeroLogic.getInstance().calTeamTotalForce(user, 501, false); if(force==0){ @@ -136,7 +142,6 @@ public class GuildFightLogic { } } } - oneInfo.setTeam(team); Family.FamilyDefendDetailViewResponse.Builder response = Family.FamilyDefendDetailViewResponse.newBuilder(); response.setTeamInfo(oneInfo); MessageUtil.sendMessage(session, 1, messageType.getNumber(), response.build(), true); 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 e8e615fd7..98748105e 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 @@ -1300,7 +1300,7 @@ public class HeroLogic { } - public int calHeoForce(User user, Hero hero,boolean isMyself){ + public int calHeoForce(User user, Hero hero){ Map heroAllAttribute; heroAllAttribute = calHeroNotBufferAttribute(user, hero,true,0); //战力保存 @@ -1309,7 +1309,7 @@ public class HeroLogic { } - private int calForce( Map heroAllAttribute ){ + public int calForce( Map heroAllAttribute ){ double result = 0; for(Map.Entry item : heroAllAttribute.entrySet()){ Integer propertyId = item.getKey(); @@ -1806,7 +1806,7 @@ public class HeroLogic { if (hero == null) { continue; } - totalForce +=calHeoForce(targetUser, hero,isMyself); + totalForce +=calHeoForce(targetUser, hero); } return totalForce; } @@ -2054,7 +2054,7 @@ public class HeroLogic { for(TeamPosHeroInfo teamPosHeroInfo: teamPosHeroInfoList){ String heroId = teamPosHeroInfo.getHeroId(); Hero hero = heroMap.get(heroId); - heroPosMap.put(teamPosHeroInfo.getPosition(),calHeoForce(user,hero,false)); + heroPosMap.put(teamPosHeroInfo.getPosition(),calHeoForce(user,hero)); } for(int i=1;i<6;i++){ Integer force = heroPosMap.get(i); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 99ec807cc..123c0b41d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -35,6 +35,7 @@ import manager.STableManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import util.MathUtils; +import util.StringUtil; import util.TimeUtils; import java.util.*; @@ -460,7 +461,7 @@ public class PlayerLogic { if(teamPosManager.getTeamPosForHero().containsKey(teamId)){ for (TeamPosHeroInfo heroInfo:teamPosManager.getTeamPosForHero().get(teamId)) { Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId()); - teamInfo.addTeam(CommonProto.TeamInfoDeatail.newBuilder().setHeroTid(hero.getTemplateId()).setLevel(hero.getLevel()).setStar(hero.getStar()).build()); + teamInfo.addTeam(CBean2Proto.getSimpleTeamInfoByHero(hero)); } } oneInfo.setTeam(teamInfo); @@ -470,6 +471,40 @@ public class PlayerLogic { } + public void viewHeroInfo(ISession session,int uid,String heroId) throws Exception { + User userInMem = UserManager.getUserInMem(uid); + int resMsgId = MessageTypeProto.MessageType.VIEW_HERO_INFO_RESPONSE_VALUE; + if(userInMem == null){ + MessageUtil.sendErrorResponse(session,0,resMsgId,"not allowed"); + return; + } + Hero hero = userInMem.getHeroManager().getHeroMap().get(heroId); + if(hero == null){ + MessageUtil.sendErrorResponse(session,0,resMsgId,"hero no"); + return; + } + PlayerInfoProto.ViewHeroInfoResponse.Builder builder = PlayerInfoProto.ViewHeroInfoResponse.newBuilder(); + Map heroNotBufferAttribute = HeroLogic.getInstance().calHeroNotBufferAttribute(userInMem, hero, true, 0); + for(Map.Entry item : heroNotBufferAttribute.entrySet()){ + builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(item.getKey()).setPropertyValue(item.getValue()).build()); + } + EquipManager equipManager = userInMem.getEquipManager(); + Map equipMap = equipManager.getEquipMap(); + for(String equipId : hero.getEquipByPositionMap().values()){ + builder.addEquip(CBean2Proto.getEquipProto(equipMap.get(equipId))); + } + Map soulEquipMap = equipManager.getSoulEquipMap(); + for(String equipId : hero.getSoulEquipByPositionMap().values()){ + builder.addEquip(CBean2Proto.getEquipProto(soulEquipMap.get(equipId))); + } + String especialEquip = hero.getEspecialEquip(); + if(!StringUtil.isEmpty(especialEquip)){ + builder.addEquip(CBean2Proto.getEquipProto(equipManager.getEspecialEquipMap().get(especialEquip))); + } + builder.setForce(HeroLogic.getInstance().calForce(heroNotBufferAttribute)); + MessageUtil.sendMessage(session,1,resMsgId,builder.build(),true); + } + public void takeSevenScoreReward(ISession iSession) throws Exception { User user = UserManager.getUser(iSession.getUid()); int msgId = MessageTypeProto.MessageType.TAKE_SEVEN_HAPPY_REWARD_RESPONSE_VALUE; 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 80863a816..1d83cf576 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -495,4 +495,9 @@ public class CBean2Proto { } return builder.build(); } + + + public static CommonProto.TeamSimpleInfo getSimpleTeamInfoByHero(Hero hero){ + return CommonProto.TeamSimpleInfo.newBuilder().setHeroid(hero.getId()).setHeroTid(hero.getTemplateId()).setLevel(hero.getLevel()).setStar(hero.getStar()).build(); + } }