soul equip

back_recharge
wangyuan 2020-04-09 20:35:50 +08:00
parent 071a6c8aa2
commit 2c937c623e
14 changed files with 1848 additions and 627 deletions

View File

@ -7306,9 +7306,9 @@ public final class CommonProto {
public interface SoulPosOrBuilder
extends com.google.protobuf.MessageOrBuilder {
// optional string equipId = 1;
// optional int32 equipId = 1;
/**
* <code>optional string equipId = 1;</code>
* <code>optional int32 equipId = 1;</code>
*
* <pre>
*id
@ -7316,22 +7316,13 @@ public final class CommonProto {
*/
boolean hasEquipId();
/**
* <code>optional string equipId = 1;</code>
* <code>optional int32 equipId = 1;</code>
*
* <pre>
*id
* </pre>
*/
java.lang.String getEquipId();
/**
* <code>optional string equipId = 1;</code>
*
* <pre>
*id
* </pre>
*/
com.google.protobuf.ByteString
getEquipIdBytes();
int getEquipId();
// optional int32 position = 2;
/**
@ -7402,9 +7393,9 @@ public final class CommonProto {
}
break;
}
case 10: {
case 8: {
bitField0_ |= 0x00000001;
equipId_ = input.readBytes();
equipId_ = input.readInt32();
break;
}
case 16: {
@ -7452,11 +7443,11 @@ public final class CommonProto {
}
private int bitField0_;
// optional string equipId = 1;
// optional int32 equipId = 1;
public static final int EQUIPID_FIELD_NUMBER = 1;
private java.lang.Object equipId_;
private int equipId_;
/**
* <code>optional string equipId = 1;</code>
* <code>optional int32 equipId = 1;</code>
*
* <pre>
*id
@ -7466,45 +7457,14 @@ public final class CommonProto {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>optional string equipId = 1;</code>
* <code>optional int32 equipId = 1;</code>
*
* <pre>
*id
* </pre>
*/
public java.lang.String getEquipId() {
java.lang.Object ref = equipId_;
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()) {
equipId_ = s;
}
return s;
}
}
/**
* <code>optional string equipId = 1;</code>
*
* <pre>
*id
* </pre>
*/
public com.google.protobuf.ByteString
getEquipIdBytes() {
java.lang.Object ref = equipId_;
if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
equipId_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
public int getEquipId() {
return equipId_;
}
// optional int32 position = 2;
@ -7532,7 +7492,7 @@ public final class CommonProto {
}
private void initFields() {
equipId_ = "";
equipId_ = 0;
position_ = 0;
}
private byte memoizedIsInitialized = -1;
@ -7548,7 +7508,7 @@ public final class CommonProto {
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeBytes(1, getEquipIdBytes());
output.writeInt32(1, equipId_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt32(2, position_);
@ -7564,7 +7524,7 @@ public final class CommonProto {
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(1, getEquipIdBytes());
.computeInt32Size(1, equipId_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
@ -7686,7 +7646,7 @@ public final class CommonProto {
public Builder clear() {
super.clear();
equipId_ = "";
equipId_ = 0;
bitField0_ = (bitField0_ & ~0x00000001);
position_ = 0;
bitField0_ = (bitField0_ & ~0x00000002);
@ -7743,9 +7703,7 @@ public final class CommonProto {
public Builder mergeFrom(com.ljsd.jieling.protocols.CommonProto.SoulPos other) {
if (other == com.ljsd.jieling.protocols.CommonProto.SoulPos.getDefaultInstance()) return this;
if (other.hasEquipId()) {
bitField0_ |= 0x00000001;
equipId_ = other.equipId_;
onChanged();
setEquipId(other.getEquipId());
}
if (other.hasPosition()) {
setPosition(other.getPosition());
@ -7777,10 +7735,10 @@ public final class CommonProto {
}
private int bitField0_;
// optional string equipId = 1;
private java.lang.Object equipId_ = "";
// optional int32 equipId = 1;
private int equipId_ ;
/**
* <code>optional string equipId = 1;</code>
* <code>optional int32 equipId = 1;</code>
*
* <pre>
*id
@ -7790,62 +7748,30 @@ public final class CommonProto {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>optional string equipId = 1;</code>
* <code>optional int32 equipId = 1;</code>
*
* <pre>
*id
* </pre>
*/
public java.lang.String getEquipId() {
java.lang.Object ref = equipId_;
if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((com.google.protobuf.ByteString) ref)
.toStringUtf8();
equipId_ = s;
return s;
} else {
return (java.lang.String) ref;
}
public int getEquipId() {
return equipId_;
}
/**
* <code>optional string equipId = 1;</code>
* <code>optional int32 equipId = 1;</code>
*
* <pre>
*id
* </pre>
*/
public com.google.protobuf.ByteString
getEquipIdBytes() {
java.lang.Object ref = equipId_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
equipId_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
/**
* <code>optional string equipId = 1;</code>
*
* <pre>
*id
* </pre>
*/
public Builder setEquipId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000001;
public Builder setEquipId(int value) {
bitField0_ |= 0x00000001;
equipId_ = value;
onChanged();
return this;
}
/**
* <code>optional string equipId = 1;</code>
* <code>optional int32 equipId = 1;</code>
*
* <pre>
*id
@ -7853,24 +7779,7 @@ public final class CommonProto {
*/
public Builder clearEquipId() {
bitField0_ = (bitField0_ & ~0x00000001);
equipId_ = getDefaultInstance().getEquipId();
onChanged();
return this;
}
/**
* <code>optional string equipId = 1;</code>
*
* <pre>
*id
* </pre>
*/
public Builder setEquipIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000001;
equipId_ = value;
equipId_ = 0;
onChanged();
return this;
}
@ -89665,7 +89574,7 @@ public final class CommonProto {
"sd.jieling.protocols.SpecialEffects\022\024\n\014r" +
"ebuildLevel\030\005 \001(\005\022\022\n\ncreateTime\030\006 \001(\005\022\017\n" +
"\007skillId\030\007 \001(\005\022\020\n\010isLocked\030\010 \001(\005\022\013\n\003exp\030" +
"\t \001(\005\",\n\007SoulPos\022\017\n\007equipId\030\001 \001(\t\022\020\n\010pos" +
"\t \001(\005\",\n\007SoulPos\022\017\n\007equipId\030\001 \001(\005\022\020\n\010pos" +
"ition\030\002 \001(\005\"\203\002\n\004Hero\022\n\n\002id\030\001 \001(\t\022\016\n\006hero" +
"Id\030\002 \001(\005\022\r\n\005level\030\003 \001(\005\022\017\n\007breakId\030\004 \001(\005" +
"\022\014\n\004star\030\005 \001(\005\022\016\n\006skinId\030\006 \001(\005\022\023\n\013equipI",

View File

@ -2676,6 +2676,18 @@ public final class MessageTypeProto {
* <code>SOUL_FORCE_RAND_EQUIP_RESPONSE = 11838;</code>
*/
SOUL_FORCE_RAND_EQUIP_RESPONSE(425, 11838),
/**
* <code>SOUL_MERGE_REQUEST = 11839;</code>
*
* <pre>
*
* </pre>
*/
SOUL_MERGE_REQUEST(426, 11839),
/**
* <code>SOUL_MERGE_RESPONSE = 11840;</code>
*/
SOUL_MERGE_RESPONSE(427, 11840),
/**
* <code>TRIGGER_EVENT_REQUEST = 11900;</code>
*
@ -2683,11 +2695,11 @@ public final class MessageTypeProto {
* T 11900
* </pre>
*/
TRIGGER_EVENT_REQUEST(426, 11900),
TRIGGER_EVENT_REQUEST(428, 11900),
/**
* <code>TRIGGER_EVENT_RESPONSE = 11901;</code>
*/
TRIGGER_EVENT_RESPONSE(427, 11901),
TRIGGER_EVENT_RESPONSE(429, 11901),
/**
* <code>TEAM_POS_SAVE_REQUEST = 11902;</code>
*
@ -2695,11 +2707,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
TEAM_POS_SAVE_REQUEST(428, 11902),
TEAM_POS_SAVE_REQUEST(430, 11902),
/**
* <code>TEAM_POS_SAVE_RESPONSE = 11903;</code>
*/
TEAM_POS_SAVE_RESPONSE(429, 11903),
TEAM_POS_SAVE_RESPONSE(431, 11903),
/**
* <code>TAKE_ACTIVITY_REWARD_REQUEST = 11904;</code>
*
@ -2707,11 +2719,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
TAKE_ACTIVITY_REWARD_REQUEST(430, 11904),
TAKE_ACTIVITY_REWARD_REQUEST(432, 11904),
/**
* <code>TAKE_ACTIVITY_REWARD_RESPONSE = 11905;</code>
*/
TAKE_ACTIVITY_REWARD_RESPONSE(431, 11905),
TAKE_ACTIVITY_REWARD_RESPONSE(433, 11905),
/**
* <code>TAKE_MISSION_REWARD_REQUEST = 11906;</code>
*
@ -2719,11 +2731,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
TAKE_MISSION_REWARD_REQUEST(432, 11906),
TAKE_MISSION_REWARD_REQUEST(434, 11906),
/**
* <code>TAKE_MISSION_REWARD_RESPONSE = 11907;</code>
*/
TAKE_MISSION_REWARD_RESPONSE(433, 11907),
TAKE_MISSION_REWARD_RESPONSE(435, 11907),
/**
* <code>TEST_BUY_GIGT_GOODS_REQEUST = 11908;</code>
*
@ -2731,11 +2743,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
TEST_BUY_GIGT_GOODS_REQEUST(434, 11908),
TEST_BUY_GIGT_GOODS_REQEUST(436, 11908),
/**
* <code>TEST_BUY_GIGT_GOODS_RESPONSE = 11909;</code>
*/
TEST_BUY_GIGT_GOODS_RESPONSE(435, 11909),
TEST_BUY_GIGT_GOODS_RESPONSE(437, 11909),
/**
* <code>TAKE_TOWER_REWARD_REQUEST = 11910;</code>
*
@ -2743,11 +2755,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
TAKE_TOWER_REWARD_REQUEST(436, 11910),
TAKE_TOWER_REWARD_REQUEST(438, 11910),
/**
* <code>TAKE_TOWER_REWARD_RESPONSE = 11911;</code>
*/
TAKE_TOWER_REWARD_RESPONSE(437, 11911),
TAKE_TOWER_REWARD_RESPONSE(439, 11911),
/**
* <code>TAKE_SEVEN_HAPPY_REWARD_REQUEST = 11912;</code>
*
@ -2755,11 +2767,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
TAKE_SEVEN_HAPPY_REWARD_REQUEST(438, 11912),
TAKE_SEVEN_HAPPY_REWARD_REQUEST(440, 11912),
/**
* <code>TAKE_SEVEN_HAPPY_REWARD_RESPONSE = 11913;</code>
*/
TAKE_SEVEN_HAPPY_REWARD_RESPONSE(439, 11913),
TAKE_SEVEN_HAPPY_REWARD_RESPONSE(441, 11913),
/**
* <code>TO_BE_STRONGER_REQUEST = 11914;</code>
*
@ -2767,11 +2779,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
TO_BE_STRONGER_REQUEST(440, 11914),
TO_BE_STRONGER_REQUEST(442, 11914),
/**
* <code>TO_BE_STRONGER_RESPONSE = 11915;</code>
*/
TO_BE_STRONGER_RESPONSE(441, 11915),
TO_BE_STRONGER_RESPONSE(443, 11915),
/**
* <code>TREASURE_REFRESH_INDICATION = 11916;</code>
*
@ -2779,7 +2791,7 @@ public final class MessageTypeProto {
*
* </pre>
*/
TREASURE_REFRESH_INDICATION(442, 11916),
TREASURE_REFRESH_INDICATION(444, 11916),
/**
* <code>TREASURE_LEVELUP_INDICATION = 11917;</code>
*
@ -2787,7 +2799,7 @@ public final class MessageTypeProto {
*
* </pre>
*/
TREASURE_LEVELUP_INDICATION(443, 11917),
TREASURE_LEVELUP_INDICATION(445, 11917),
/**
* <code>TREASURE_REFRESH_TIME_REQUEST = 11918;</code>
*
@ -2795,11 +2807,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
TREASURE_REFRESH_TIME_REQUEST(444, 11918),
TREASURE_REFRESH_TIME_REQUEST(446, 11918),
/**
* <code>TREASURE_REFRESH_TIME_RESPONSE = 11919;</code>
*/
TREASURE_REFRESH_TIME_RESPONSE(445, 11919),
TREASURE_REFRESH_TIME_RESPONSE(447, 11919),
/**
* <code>UP_HERO_LEVEL_REQUEST = 12000;</code>
*
@ -2807,11 +2819,11 @@ public final class MessageTypeProto {
* U 12000
* </pre>
*/
UP_HERO_LEVEL_REQUEST(446, 12000),
UP_HERO_LEVEL_REQUEST(448, 12000),
/**
* <code>UP_HERO_LEVEL_RESPONSE = 12001;</code>
*/
UP_HERO_LEVEL_RESPONSE(447, 12001),
UP_HERO_LEVEL_RESPONSE(449, 12001),
/**
* <code>UP_HERO_STAR_REQUEST = 12002;</code>
*
@ -2819,11 +2831,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
UP_HERO_STAR_REQUEST(448, 12002),
UP_HERO_STAR_REQUEST(450, 12002),
/**
* <code>UP_HERO_STAR_RESPONSE = 12003;</code>
*/
UP_HERO_STAR_RESPONSE(449, 12003),
UP_HERO_STAR_RESPONSE(451, 12003),
/**
* <code>USER_AND_PRICE_ITEM_REQUEST = 12004;</code>
*
@ -2831,11 +2843,11 @@ public final class MessageTypeProto {
*使
* </pre>
*/
USER_AND_PRICE_ITEM_REQUEST(450, 12004),
USER_AND_PRICE_ITEM_REQUEST(452, 12004),
/**
* <code>USER_AND_PRICE_ITEM_RESPONSE = 12005;</code>
*/
USER_AND_PRICE_ITEM_RESPONSE(451, 12005),
USER_AND_PRICE_ITEM_RESPONSE(453, 12005),
/**
* <code>USER_FORCE_CHANGE_REQUEST = 12006;</code>
*
@ -2843,11 +2855,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
USER_FORCE_CHANGE_REQUEST(452, 12006),
USER_FORCE_CHANGE_REQUEST(454, 12006),
/**
* <code>USER_FORCE_CHANGE_RESPONSE = 12007;</code>
*/
USER_FORCE_CHANGE_RESPONSE(453, 12007),
USER_FORCE_CHANGE_RESPONSE(455, 12007),
/**
* <code>UPDATE_BAG_INDICATION = 12008;</code>
*
@ -2855,7 +2867,7 @@ public final class MessageTypeProto {
*
* </pre>
*/
UPDATE_BAG_INDICATION(454, 12008),
UPDATE_BAG_INDICATION(456, 12008),
/**
* <code>UPDATE_STATE_REQUEST = 12009;</code>
*
@ -2863,11 +2875,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
UPDATE_STATE_REQUEST(455, 12009),
UPDATE_STATE_REQUEST(457, 12009),
/**
* <code>UPDATE_STATE_RESPONSE = 12010;</code>
*/
UPDATE_STATE_RESPONSE(456, 12010),
UPDATE_STATE_RESPONSE(458, 12010),
/**
* <code>UPDATE_USER_EXP_INDICATION = 12011;</code>
*
@ -2875,7 +2887,7 @@ public final class MessageTypeProto {
*
* </pre>
*/
UPDATE_USER_EXP_INDICATION(457, 12011),
UPDATE_USER_EXP_INDICATION(459, 12011),
/**
* <code>UPDATE_SECRET_BOX_SEASON_INDICATION = 12012;</code>
*
@ -2883,7 +2895,7 @@ public final class MessageTypeProto {
*
* </pre>
*/
UPDATE_SECRET_BOX_SEASON_INDICATION(458, 12012),
UPDATE_SECRET_BOX_SEASON_INDICATION(460, 12012),
/**
* <code>UPDATE_PHONE_INFO_REQUEST = 12013;</code>
*
@ -2891,11 +2903,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
UPDATE_PHONE_INFO_REQUEST(459, 12013),
UPDATE_PHONE_INFO_REQUEST(461, 12013),
/**
* <code>UPDATE_PHONE_INFO_RESPONSE = 12014;</code>
*/
UPDATE_PHONE_INFO_RESPONSE(460, 12014),
UPDATE_PHONE_INFO_RESPONSE(462, 12014),
/**
* <code>UPDATE_QUESTION_REQUEST = 12015;</code>
*
@ -2903,15 +2915,15 @@ public final class MessageTypeProto {
*
* </pre>
*/
UPDATE_QUESTION_REQUEST(461, 12015),
UPDATE_QUESTION_REQUEST(463, 12015),
/**
* <code>UPDATE_QUESTION_RESPONSE = 12016;</code>
*/
UPDATE_QUESTION_RESPONSE(462, 12016),
UPDATE_QUESTION_RESPONSE(464, 12016),
/**
* <code>UP_SOUL_EQUIP_QUICK_REQUEST = 12018;</code>
*/
UP_SOUL_EQUIP_QUICK_REQUEST(463, 12018),
UP_SOUL_EQUIP_QUICK_REQUEST(465, 12018),
/**
* <code>UP_SOUL_EQUIP_RESPONSE = 12019;</code>
*
@ -2919,7 +2931,7 @@ public final class MessageTypeProto {
*
* </pre>
*/
UP_SOUL_EQUIP_RESPONSE(464, 12019),
UP_SOUL_EQUIP_RESPONSE(466, 12019),
/**
* <code>VIEW_FIGHTREPLAY_REQUEST = 12100;</code>
*
@ -2927,11 +2939,11 @@ public final class MessageTypeProto {
* V 12100
* </pre>
*/
VIEW_FIGHTREPLAY_REQUEST(465, 12100),
VIEW_FIGHTREPLAY_REQUEST(467, 12100),
/**
* <code>VIEW_FIGHTREPLAY_RESPONSE = 12101;</code>
*/
VIEW_FIGHTREPLAY_RESPONSE(466, 12101),
VIEW_FIGHTREPLAY_RESPONSE(468, 12101),
/**
* <code>VIP_LEVELUP_REQEUST = 12102;</code>
*
@ -2939,11 +2951,11 @@ public final class MessageTypeProto {
*VIP
* </pre>
*/
VIP_LEVELUP_REQEUST(467, 12102),
VIP_LEVELUP_REQEUST(469, 12102),
/**
* <code>VIP_LEVELUP_RESPONSE = 12103;</code>
*/
VIP_LEVELUP_RESPONSE(468, 12103),
VIP_LEVELUP_RESPONSE(470, 12103),
/**
* <code>VIP_TAKE_REWARD_REQUEST = 12104;</code>
*
@ -2951,11 +2963,11 @@ public final class MessageTypeProto {
*vip
* </pre>
*/
VIP_TAKE_REWARD_REQUEST(469, 12104),
VIP_TAKE_REWARD_REQUEST(471, 12104),
/**
* <code>VIP_TAKE_REWARD_RESPONSE = 12105;</code>
*/
VIP_TAKE_REWARD_RESPONSE(470, 12105),
VIP_TAKE_REWARD_RESPONSE(472, 12105),
/**
* <code>VIEW_HERO_INFO_REQUEST = 12106;</code>
*
@ -2963,11 +2975,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
VIEW_HERO_INFO_REQUEST(471, 12106),
VIEW_HERO_INFO_REQUEST(473, 12106),
/**
* <code>VIEW_HERO_INFO_RESPONSE = 12107;</code>
*/
VIEW_HERO_INFO_RESPONSE(472, 12107),
VIEW_HERO_INFO_RESPONSE(474, 12107),
/**
* <code>VIP_TAKE_DAILY_REQUEST = 12108;</code>
*
@ -2975,11 +2987,11 @@ public final class MessageTypeProto {
*vip
* </pre>
*/
VIP_TAKE_DAILY_REQUEST(473, 12108),
VIP_TAKE_DAILY_REQUEST(475, 12108),
/**
* <code>VIP_TAKE_DAILY_RESPONSE = 12109;</code>
*/
VIP_TAKE_DAILY_RESPONSE(474, 12109),
VIP_TAKE_DAILY_RESPONSE(476, 12109),
/**
* <code>WORKSHOP_FOUNDATION_REQUEST = 12200;</code>
*
@ -2987,11 +2999,11 @@ public final class MessageTypeProto {
* W 12200
* </pre>
*/
WORKSHOP_FOUNDATION_REQUEST(475, 12200),
WORKSHOP_FOUNDATION_REQUEST(477, 12200),
/**
* <code>WORKSHOP_FOUNDATION_RESPONSE = 12201;</code>
*/
WORKSHOP_FOUNDATION_RESPONSE(476, 12201),
WORKSHOP_FOUNDATION_RESPONSE(478, 12201),
/**
* <code>WORKSHOP_EQUIP_CREATE_REQUEST = 12202;</code>
*
@ -2999,11 +3011,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
WORKSHOP_EQUIP_CREATE_REQUEST(477, 12202),
WORKSHOP_EQUIP_CREATE_REQUEST(479, 12202),
/**
* <code>WORKSHOP_EQUIP_CREATE_RESPONSE = 12203;</code>
*/
WORKSHOP_EQUIP_CREATE_RESPONSE(478, 12203),
WORKSHOP_EQUIP_CREATE_RESPONSE(480, 12203),
/**
* <code>WORKSHOP_REBUILD_REQUEST = 12204;</code>
*
@ -3011,11 +3023,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
WORKSHOP_REBUILD_REQUEST(479, 12204),
WORKSHOP_REBUILD_REQUEST(481, 12204),
/**
* <code>WORKSHOP_REBUILD_RESPONSE = 12205;</code>
*/
WORKSHOP_REBUILD_RESPONSE(480, 12205),
WORKSHOP_REBUILD_RESPONSE(482, 12205),
/**
* <code>WORKSHOP_REBUILD_CONFIRM_REQUEST = 12206;</code>
*
@ -3023,11 +3035,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
WORKSHOP_REBUILD_CONFIRM_REQUEST(481, 12206),
WORKSHOP_REBUILD_CONFIRM_REQUEST(483, 12206),
/**
* <code>WORKSHOP_REBUILD_CONFIRM_RESONSE = 12207;</code>
*/
WORKSHOP_REBUILD_CONFIRM_RESONSE(482, 12207),
WORKSHOP_REBUILD_CONFIRM_RESONSE(484, 12207),
/**
* <code>WORKSHOP_LEVELUP_REQUEST = 12208;</code>
*
@ -3035,11 +3047,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
WORKSHOP_LEVELUP_REQUEST(483, 12208),
WORKSHOP_LEVELUP_REQUEST(485, 12208),
/**
* <code>WORKSHOP_LEVELUP_RESPONSE = 12209;</code>
*/
WORKSHOP_LEVELUP_RESPONSE(484, 12209),
WORKSHOP_LEVELUP_RESPONSE(486, 12209),
/**
* <code>WORKSHOP_TECHNOLOGY_LEVEL_REQUEST = 12210;</code>
*
@ -3047,11 +3059,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
WORKSHOP_TECHNOLOGY_LEVEL_REQUEST(485, 12210),
WORKSHOP_TECHNOLOGY_LEVEL_REQUEST(487, 12210),
/**
* <code>WORKSHOP_TECHNOLOGY_RESPONSE = 12211;</code>
*/
WORKSHOP_TECHNOLOGY_RESPONSE(486, 12211),
WORKSHOP_TECHNOLOGY_RESPONSE(488, 12211),
/**
* <code>WORKSHOP_TECHNOLOGY_RESET_REQUEST = 12212;</code>
*
@ -3059,11 +3071,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
WORKSHOP_TECHNOLOGY_RESET_REQUEST(487, 12212),
WORKSHOP_TECHNOLOGY_RESET_REQUEST(489, 12212),
/**
* <code>WORKSHOP_TECHNOLOGY_RESET_RESPONSE = 12213;</code>
*/
WORKSHOP_TECHNOLOGY_RESET_RESPONSE(488, 12213),
WORKSHOP_TECHNOLOGY_RESET_RESPONSE(490, 12213),
/**
* <code>EXPEDITION_GET_EXPEDITION_REQUEST = 20002;</code>
*
@ -3071,11 +3083,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
EXPEDITION_GET_EXPEDITION_REQUEST(489, 20002),
EXPEDITION_GET_EXPEDITION_REQUEST(491, 20002),
/**
* <code>EXPEDITION_GET_EXPEDITION_RESONSE = 20003;</code>
*/
EXPEDITION_GET_EXPEDITION_RESONSE(490, 20003),
EXPEDITION_GET_EXPEDITION_RESONSE(492, 20003),
/**
* <code>EXPEDITION_TAKE_BOXREWARD_REQUEST = 20004;</code>
*
@ -3083,11 +3095,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
EXPEDITION_TAKE_BOXREWARD_REQUEST(491, 20004),
EXPEDITION_TAKE_BOXREWARD_REQUEST(493, 20004),
/**
* <code>EXPEDITION_TAKE_BOXREWARD_RESONSE = 20005;</code>
*/
EXPEDITION_TAKE_BOXREWARD_RESONSE(492, 20005),
EXPEDITION_TAKE_BOXREWARD_RESONSE(494, 20005),
/**
* <code>EXPEDITION_RELIVE_HERO_REQUEST = 20006;</code>
*
@ -3095,11 +3107,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
EXPEDITION_RELIVE_HERO_REQUEST(493, 20006),
EXPEDITION_RELIVE_HERO_REQUEST(495, 20006),
/**
* <code>EXPEDITION_RELIVE_HERO_RESONSE = 20007;</code>
*/
EXPEDITION_RELIVE_HERO_RESONSE(494, 20007),
EXPEDITION_RELIVE_HERO_RESONSE(496, 20007),
/**
* <code>EXPEDITION_START_BATTLE_REQUEST = 20008;</code>
*
@ -3107,11 +3119,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
EXPEDITION_START_BATTLE_REQUEST(495, 20008),
EXPEDITION_START_BATTLE_REQUEST(497, 20008),
/**
* <code>EXPEDITION_START_BATTLE_RESONSE = 20009;</code>
*/
EXPEDITION_START_BATTLE_RESONSE(496, 20009),
EXPEDITION_START_BATTLE_RESONSE(498, 20009),
/**
* <code>EXPEDITION_END_BATTLE_REQUEST = 20010;</code>
*
@ -3119,11 +3131,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
EXPEDITION_END_BATTLE_REQUEST(497, 20010),
EXPEDITION_END_BATTLE_REQUEST(499, 20010),
/**
* <code>EXPEDITION_END_BATTLE_RESONSE = 20011;</code>
*/
EXPEDITION_END_BATTLE_RESONSE(498, 20011),
EXPEDITION_END_BATTLE_RESONSE(500, 20011),
/**
* <code>EXPEDITION_TAKE_HOLY_EQUIP_REQUEST = 20012;</code>
*
@ -3131,11 +3143,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
EXPEDITION_TAKE_HOLY_EQUIP_REQUEST(499, 20012),
EXPEDITION_TAKE_HOLY_EQUIP_REQUEST(501, 20012),
/**
* <code>EXPEDITION_TAKE_HOLY_EQUIP_RESONSE = 20013;</code>
*/
EXPEDITION_TAKE_HOLY_EQUIP_RESONSE(500, 20013),
EXPEDITION_TAKE_HOLY_EQUIP_RESONSE(502, 20013),
/**
* <code>EXPEDITION_RECOVER_HERO_REQUEST = 20014;</code>
*
@ -3143,11 +3155,11 @@ public final class MessageTypeProto {
*
* </pre>
*/
EXPEDITION_RECOVER_HERO_REQUEST(501, 20014),
EXPEDITION_RECOVER_HERO_REQUEST(503, 20014),
/**
* <code>EXPEDITION_RECOVER_HERO_RESONSE = 20015;</code>
*/
EXPEDITION_RECOVER_HERO_RESONSE(502, 20015),
EXPEDITION_RECOVER_HERO_RESONSE(504, 20015),
/**
* <code>EXPEDITION_HOLY_BAG_INDICATION = 20016;</code>
*
@ -3155,7 +3167,7 @@ public final class MessageTypeProto {
*
* </pre>
*/
EXPEDITION_HOLY_BAG_INDICATION(503, 20016),
EXPEDITION_HOLY_BAG_INDICATION(505, 20016),
/**
* <code>EXPEDITION_NOINFO_INDICATION = 20017;</code>
*
@ -3163,7 +3175,7 @@ public final class MessageTypeProto {
*
* </pre>
*/
EXPEDITION_NOINFO_INDICATION(504, 20017),
EXPEDITION_NOINFO_INDICATION(506, 20017),
/**
* <code>MONTHCARD_TAKE_DAILY_REQUEST = 20101;</code>
*
@ -3171,15 +3183,15 @@ public final class MessageTypeProto {
* 20101 - 20110
* </pre>
*/
MONTHCARD_TAKE_DAILY_REQUEST(505, 20101),
MONTHCARD_TAKE_DAILY_REQUEST(507, 20101),
/**
* <code>MONTHCARD_TAKE_DAILY_RESPONSE = 20102;</code>
*/
MONTHCARD_TAKE_DAILY_RESPONSE(506, 20102),
MONTHCARD_TAKE_DAILY_RESPONSE(508, 20102),
/**
* <code>MONTHCARD_INDICATION = 20103;</code>
*/
MONTHCARD_INDICATION(507, 20103),
MONTHCARD_INDICATION(509, 20103),
;
/**
@ -5845,6 +5857,18 @@ public final class MessageTypeProto {
* <code>SOUL_FORCE_RAND_EQUIP_RESPONSE = 11838;</code>
*/
public static final int SOUL_FORCE_RAND_EQUIP_RESPONSE_VALUE = 11838;
/**
* <code>SOUL_MERGE_REQUEST = 11839;</code>
*
* <pre>
*
* </pre>
*/
public static final int SOUL_MERGE_REQUEST_VALUE = 11839;
/**
* <code>SOUL_MERGE_RESPONSE = 11840;</code>
*/
public static final int SOUL_MERGE_RESPONSE_VALUE = 11840;
/**
* <code>TRIGGER_EVENT_REQUEST = 11900;</code>
*
@ -6781,6 +6805,8 @@ public final class MessageTypeProto {
case 11836: return SOUL_RAND_EQUIP_RESPONSE;
case 11837: return SOUL_FORCE_RAND_EQUIP_REQUEST;
case 11838: return SOUL_FORCE_RAND_EQUIP_RESPONSE;
case 11839: return SOUL_MERGE_REQUEST;
case 11840: return SOUL_MERGE_RESPONSE;
case 11900: return TRIGGER_EVENT_REQUEST;
case 11901: return TRIGGER_EVENT_RESPONSE;
case 11902: return TEAM_POS_SAVE_REQUEST;
@ -6924,7 +6950,7 @@ public final class MessageTypeProto {
static {
java.lang.String[] descriptorData = {
"\n\026MessageTypeProto.proto\022\032com.ljsd.jieli" +
"ng.protocols*\216\201\001\n\013MessageType\022\027\n\022HEART_B" +
"ng.protocols*\301\201\001\n\013MessageType\022\027\n\022HEART_B" +
"EAT_REQUEST\020\350\007\022\030\n\023HEART_BEAT_RESPONSE\020\351\007" +
"\022\036\n\031ACTIVITE_WORKSHOP_REQUEST\020\224N\022\037\n\032ACTI" +
"VITE_WORKSHOP_RESPONSE\020\225N\022\027\n\022ARENA_INFO_" +
@ -7267,77 +7293,78 @@ public final class MessageTypeProto {
"P_UNLOAD_OPT_RESPONSE\020\272\\\022\034\n\027SOUL_RAND_EQ" +
"UIP_REQUEST\020\273\\\022\035\n\030SOUL_RAND_EQUIP_RESPON" +
"SE\020\274\\\022\"\n\035SOUL_FORCE_RAND_EQUIP_REQUEST\020\275" +
"\\\022#\n\036SOUL_FORCE_RAND_EQUIP_RESPONSE\020\276\\\022\032" +
"\n\025TRIGGER_EVENT_REQUEST\020\374\\\022\033\n\026TRIGGER_EV" +
"ENT_RESPONSE\020\375\\\022\032\n\025TEAM_POS_SAVE_REQUEST" +
"\020\376\\\022\033\n\026TEAM_POS_SAVE_RESPONSE\020\377\\\022!\n\034TAKE" +
"_ACTIVITY_REWARD_REQUEST\020\200]\022\"\n\035TAKE_ACTI" +
"VITY_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_REQE" +
"UST\020\204]\022!\n\034TEST_BUY_GIGT_GOODS_RESPONSE\020\205" +
"]\022\036\n\031TAKE_TOWER_REWARD_REQUEST\020\206]\022\037\n\032TAK" +
"E_TOWER_REWARD_RESPONSE\020\207]\022$\n\037TAKE_SEVEN" +
"_HAPPY_REWARD_REQUEST\020\210]\022%\n TAKE_SEVEN_H" +
"APPY_REWARD_RESPONSE\020\211]\022\033\n\026TO_BE_STRONGE" +
"R_REQUEST\020\212]\022\034\n\027TO_BE_STRONGER_RESPONSE\020" +
"\213]\022 \n\033TREASURE_REFRESH_INDICATION\020\214]\022 \n\033" +
"TREASURE_LEVELUP_INDICATION\020\215]\022\"\n\035TREASU",
"RE_REFRESH_TIME_REQUEST\020\216]\022#\n\036TREASURE_R" +
"EFRESH_TIME_RESPONSE\020\217]\022\032\n\025UP_HERO_LEVEL" +
"_REQUEST\020\340]\022\033\n\026UP_HERO_LEVEL_RESPONSE\020\341]" +
"\022\031\n\024UP_HERO_STAR_REQUEST\020\342]\022\032\n\025UP_HERO_S" +
"TAR_RESPONSE\020\343]\022 \n\033USER_AND_PRICE_ITEM_R" +
"EQUEST\020\344]\022!\n\034USER_AND_PRICE_ITEM_RESPONS" +
"E\020\345]\022\036\n\031USER_FORCE_CHANGE_REQUEST\020\346]\022\037\n\032" +
"USER_FORCE_CHANGE_RESPONSE\020\347]\022\032\n\025UPDATE_" +
"BAG_INDICATION\020\350]\022\031\n\024UPDATE_STATE_REQUES" +
"T\020\351]\022\032\n\025UPDATE_STATE_RESPONSE\020\352]\022\037\n\032UPDA",
"TE_USER_EXP_INDICATION\020\353]\022(\n#UPDATE_SECR" +
"ET_BOX_SEASON_INDICATION\020\354]\022\036\n\031UPDATE_PH" +
"ONE_INFO_REQUEST\020\355]\022\037\n\032UPDATE_PHONE_INFO" +
"_RESPONSE\020\356]\022\034\n\027UPDATE_QUESTION_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_E" +
"QUIP_RESPONSE\020\363]\022\035\n\030VIEW_FIGHTREPLAY_REQ" +
"UEST\020\304^\022\036\n\031VIEW_FIGHTREPLAY_RESPONSE\020\305^\022" +
"\030\n\023VIP_LEVELUP_REQEUST\020\306^\022\031\n\024VIP_LEVELUP" +
"_RESPONSE\020\307^\022\034\n\027VIP_TAKE_REWARD_REQUEST\020",
"\310^\022\035\n\030VIP_TAKE_REWARD_RESPONSE\020\311^\022\033\n\026VIE" +
"W_HERO_INFO_REQUEST\020\312^\022\034\n\027VIEW_HERO_INFO" +
"_RESPONSE\020\313^\022\033\n\026VIP_TAKE_DAILY_REQUEST\020\314" +
"^\022\034\n\027VIP_TAKE_DAILY_RESPONSE\020\315^\022 \n\033WORKS" +
"HOP_FOUNDATION_REQUEST\020\250_\022!\n\034WORKSHOP_FO" +
"UNDATION_RESPONSE\020\251_\022\"\n\035WORKSHOP_EQUIP_C" +
"REATE_REQUEST\020\252_\022#\n\036WORKSHOP_EQUIP_CREAT" +
"E_RESPONSE\020\253_\022\035\n\030WORKSHOP_REBUILD_REQUES" +
"T\020\254_\022\036\n\031WORKSHOP_REBUILD_RESPONSE\020\255_\022%\n " +
"WORKSHOP_REBUILD_CONFIRM_REQUEST\020\256_\022%\n W",
"ORKSHOP_REBUILD_CONFIRM_RESONSE\020\257_\022\035\n\030WO" +
"RKSHOP_LEVELUP_REQUEST\020\260_\022\036\n\031WORKSHOP_LE" +
"VELUP_RESPONSE\020\261_\022&\n!WORKSHOP_TECHNOLOGY" +
"_LEVEL_REQUEST\020\262_\022!\n\034WORKSHOP_TECHNOLOGY" +
"_RESPONSE\020\263_\022&\n!WORKSHOP_TECHNOLOGY_RESE" +
"T_REQUEST\020\264_\022\'\n\"WORKSHOP_TECHNOLOGY_RESE" +
"T_RESPONSE\020\265_\022\'\n!EXPEDITION_GET_EXPEDITI" +
"ON_REQUEST\020\242\234\001\022\'\n!EXPEDITION_GET_EXPEDIT" +
"ION_RESONSE\020\243\234\001\022\'\n!EXPEDITION_TAKE_BOXRE" +
"WARD_REQUEST\020\244\234\001\022\'\n!EXPEDITION_TAKE_BOXR",
"EWARD_RESONSE\020\245\234\001\022$\n\036EXPEDITION_RELIVE_H" +
"ERO_REQUEST\020\246\234\001\022$\n\036EXPEDITION_RELIVE_HER" +
"O_RESONSE\020\247\234\001\022%\n\037EXPEDITION_START_BATTLE" +
"_REQUEST\020\250\234\001\022%\n\037EXPEDITION_START_BATTLE_" +
"RESONSE\020\251\234\001\022#\n\035EXPEDITION_END_BATTLE_REQ" +
"UEST\020\252\234\001\022#\n\035EXPEDITION_END_BATTLE_RESONS" +
"E\020\253\234\001\022(\n\"EXPEDITION_TAKE_HOLY_EQUIP_REQU" +
"EST\020\254\234\001\022(\n\"EXPEDITION_TAKE_HOLY_EQUIP_RE" +
"SONSE\020\255\234\001\022%\n\037EXPEDITION_RECOVER_HERO_REQ" +
"UEST\020\256\234\001\022%\n\037EXPEDITION_RECOVER_HERO_RESO",
"NSE\020\257\234\001\022$\n\036EXPEDITION_HOLY_BAG_INDICATIO" +
"N\020\260\234\001\022\"\n\034EXPEDITION_NOINFO_INDICATION\020\261\234" +
"\001\022\"\n\034MONTHCARD_TAKE_DAILY_REQUEST\020\205\235\001\022#\n" +
"\035MONTHCARD_TAKE_DAILY_RESPONSE\020\206\235\001\022\032\n\024MO" +
"NTHCARD_INDICATION\020\207\235\001B\002H\001"
"\\\022#\n\036SOUL_FORCE_RAND_EQUIP_RESPONSE\020\276\\\022\027" +
"\n\022SOUL_MERGE_REQUEST\020\277\\\022\030\n\023SOUL_MERGE_RE" +
"SPONSE\020\300\\\022\032\n\025TRIGGER_EVENT_REQUEST\020\374\\\022\033\n" +
"\026TRIGGER_EVENT_RESPONSE\020\375\\\022\032\n\025TEAM_POS_S" +
"AVE_REQUEST\020\376\\\022\033\n\026TEAM_POS_SAVE_RESPONSE" +
"\020\377\\\022!\n\034TAKE_ACTIVITY_REWARD_REQUEST\020\200]\022\"",
"\n\035TAKE_ACTIVITY_REWARD_RESPONSE\020\201]\022 \n\033TA" +
"KE_MISSION_REWARD_REQUEST\020\202]\022!\n\034TAKE_MIS" +
"SION_REWARD_RESPONSE\020\203]\022 \n\033TEST_BUY_GIGT" +
"_GOODS_REQEUST\020\204]\022!\n\034TEST_BUY_GIGT_GOODS" +
"_RESPONSE\020\205]\022\036\n\031TAKE_TOWER_REWARD_REQUES" +
"T\020\206]\022\037\n\032TAKE_TOWER_REWARD_RESPONSE\020\207]\022$\n" +
"\037TAKE_SEVEN_HAPPY_REWARD_REQUEST\020\210]\022%\n T" +
"AKE_SEVEN_HAPPY_REWARD_RESPONSE\020\211]\022\033\n\026TO" +
"_BE_STRONGER_REQUEST\020\212]\022\034\n\027TO_BE_STRONGE" +
"R_RESPONSE\020\213]\022 \n\033TREASURE_REFRESH_INDICA",
"TION\020\214]\022 \n\033TREASURE_LEVELUP_INDICATION\020\215" +
"]\022\"\n\035TREASURE_REFRESH_TIME_REQUEST\020\216]\022#\n" +
"\036TREASURE_REFRESH_TIME_RESPONSE\020\217]\022\032\n\025UP" +
"_HERO_LEVEL_REQUEST\020\340]\022\033\n\026UP_HERO_LEVEL_" +
"RESPONSE\020\341]\022\031\n\024UP_HERO_STAR_REQUEST\020\342]\022\032" +
"\n\025UP_HERO_STAR_RESPONSE\020\343]\022 \n\033USER_AND_P" +
"RICE_ITEM_REQUEST\020\344]\022!\n\034USER_AND_PRICE_I" +
"TEM_RESPONSE\020\345]\022\036\n\031USER_FORCE_CHANGE_REQ" +
"UEST\020\346]\022\037\n\032USER_FORCE_CHANGE_RESPONSE\020\347]" +
"\022\032\n\025UPDATE_BAG_INDICATION\020\350]\022\031\n\024UPDATE_S",
"TATE_REQUEST\020\351]\022\032\n\025UPDATE_STATE_RESPONSE" +
"\020\352]\022\037\n\032UPDATE_USER_EXP_INDICATION\020\353]\022(\n#" +
"UPDATE_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_QUESTI" +
"ON_REQUEST\020\357]\022\035\n\030UPDATE_QUESTION_RESPONS" +
"E\020\360]\022 \n\033UP_SOUL_EQUIP_QUICK_REQUEST\020\362]\022\033" +
"\n\026UP_SOUL_EQUIP_RESPONSE\020\363]\022\035\n\030VIEW_FIGH" +
"TREPLAY_REQUEST\020\304^\022\036\n\031VIEW_FIGHTREPLAY_R" +
"ESPONSE\020\305^\022\030\n\023VIP_LEVELUP_REQEUST\020\306^\022\031\n\024",
"VIP_LEVELUP_RESPONSE\020\307^\022\034\n\027VIP_TAKE_REWA" +
"RD_REQUEST\020\310^\022\035\n\030VIP_TAKE_REWARD_RESPONS" +
"E\020\311^\022\033\n\026VIEW_HERO_INFO_REQUEST\020\312^\022\034\n\027VIE" +
"W_HERO_INFO_RESPONSE\020\313^\022\033\n\026VIP_TAKE_DAIL" +
"Y_REQUEST\020\314^\022\034\n\027VIP_TAKE_DAILY_RESPONSE\020" +
"\315^\022 \n\033WORKSHOP_FOUNDATION_REQUEST\020\250_\022!\n\034" +
"WORKSHOP_FOUNDATION_RESPONSE\020\251_\022\"\n\035WORKS" +
"HOP_EQUIP_CREATE_REQUEST\020\252_\022#\n\036WORKSHOP_" +
"EQUIP_CREATE_RESPONSE\020\253_\022\035\n\030WORKSHOP_REB" +
"UILD_REQUEST\020\254_\022\036\n\031WORKSHOP_REBUILD_RESP",
"ONSE\020\255_\022%\n WORKSHOP_REBUILD_CONFIRM_REQU" +
"EST\020\256_\022%\n WORKSHOP_REBUILD_CONFIRM_RESON" +
"SE\020\257_\022\035\n\030WORKSHOP_LEVELUP_REQUEST\020\260_\022\036\n\031" +
"WORKSHOP_LEVELUP_RESPONSE\020\261_\022&\n!WORKSHOP" +
"_TECHNOLOGY_LEVEL_REQUEST\020\262_\022!\n\034WORKSHOP" +
"_TECHNOLOGY_RESPONSE\020\263_\022&\n!WORKSHOP_TECH" +
"NOLOGY_RESET_REQUEST\020\264_\022\'\n\"WORKSHOP_TECH" +
"NOLOGY_RESET_RESPONSE\020\265_\022\'\n!EXPEDITION_G" +
"ET_EXPEDITION_REQUEST\020\242\234\001\022\'\n!EXPEDITION_" +
"GET_EXPEDITION_RESONSE\020\243\234\001\022\'\n!EXPEDITION",
"_TAKE_BOXREWARD_REQUEST\020\244\234\001\022\'\n!EXPEDITIO" +
"N_TAKE_BOXREWARD_RESONSE\020\245\234\001\022$\n\036EXPEDITI" +
"ON_RELIVE_HERO_REQUEST\020\246\234\001\022$\n\036EXPEDITION" +
"_RELIVE_HERO_RESONSE\020\247\234\001\022%\n\037EXPEDITION_S" +
"TART_BATTLE_REQUEST\020\250\234\001\022%\n\037EXPEDITION_ST" +
"ART_BATTLE_RESONSE\020\251\234\001\022#\n\035EXPEDITION_END" +
"_BATTLE_REQUEST\020\252\234\001\022#\n\035EXPEDITION_END_BA" +
"TTLE_RESONSE\020\253\234\001\022(\n\"EXPEDITION_TAKE_HOLY" +
"_EQUIP_REQUEST\020\254\234\001\022(\n\"EXPEDITION_TAKE_HO" +
"LY_EQUIP_RESONSE\020\255\234\001\022%\n\037EXPEDITION_RECOV",
"ER_HERO_REQUEST\020\256\234\001\022%\n\037EXPEDITION_RECOVE" +
"R_HERO_RESONSE\020\257\234\001\022$\n\036EXPEDITION_HOLY_BA" +
"G_INDICATION\020\260\234\001\022\"\n\034EXPEDITION_NOINFO_IN" +
"DICATION\020\261\234\001\022\"\n\034MONTHCARD_TAKE_DAILY_REQ" +
"UEST\020\205\235\001\022#\n\035MONTHCARD_TAKE_DAILY_RESPONS" +
"E\020\206\235\001\022\032\n\024MONTHCARD_INDICATION\020\207\235\001B\002H\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {

View File

@ -114,6 +114,8 @@ public interface BIReason {
int EXPEDITION_BOX_REWARD = 65;//猎妖之路宝箱奖励
int EXPEDITION_DROP_REWARD = 66;//猎妖之路奖励
int UNLOAD_SOUL_REWARD = 67;//猎妖之路奖励
int ADVENTURE_UPLEVEL_CONSUME = 1000;//秘境升级
int SECRETBOX_CONSUME = 1001;//秘盒抽卡

View File

@ -26,7 +26,7 @@ public class SendChatInfoHandler extends BaseHandler{
int friendId = sendChatInfoReqest.getFriendId();
if(message.startsWith("0|//")&&GameApplication.serverProperties.isDebug()){
GmService.exeCmd(message.substring(4));
// GmService.exeCmd(message.substring(4));
ChatLogic.getInstance().sendChatMessage(iSession,chatType,message+"gm命令",friendId);
}else {
ChatLogic.getInstance().sendChatMessage(iSession,chatType,message,friendId);

View File

@ -22,6 +22,6 @@ public class SoulEquipUnLoadOptHandler extends BaseHandler<HeroInfoProto.SoulEqu
List<HeroInfoProto.SoulEquipPos> equipIdsList = equipUnLoadOptRequest.getSoulEquipIdsList();
String heroId = equipUnLoadOptRequest.getHeroId();
// HeroLogic.getInstance().unloadSoulEquipOpt(iSession,heroId,equipIdsList);
HeroLogic.getInstance().unloadSoulEquipOpt(iSession,heroId,equipIdsList);
}
}

View File

@ -18,6 +18,9 @@ public class SoulEquipWearHandler extends BaseHandler<HeroInfoProto.SoulEquipWea
@Override
public void processWithProto(ISession iSession, HeroInfoProto.SoulEquipWearRequest equipWearRequest) throws Exception {
HeroInfoProto.OptHeroSoul wearInfo = equipWearRequest.getWearInfo();
HeroInfoProto.OptHeroSoul unloadInfo = equipWearRequest.getUnloadInfo();
HeroLogic.getInstance().wearSoulEquip(iSession,wearInfo,unloadInfo);
}
}

View File

@ -30,7 +30,7 @@ public class Hero extends MongoBase {
private Map<Integer,String> equipByPositionMap;
private Map<Integer,String> soulEquipByPositionMap;
private Map<Integer,Integer> soulEquipByPositionMap;
private int breakId;
@ -150,21 +150,18 @@ public class Hero extends MongoBase {
}
public Map<Integer, String> getSoulEquipByPositionMap() {
public Map<Integer, Integer> getSoulEquipByPositionMap() {
return soulEquipByPositionMap;
}
public void updateSoulEquipPositionMap(int position,String equipId) throws Exception {
public void updateSoulEquipPositionMap(int position,int equipId) {
updateString("soulEquipByPositionMap." + position ,equipId);
this.soulEquipByPositionMap.put(position,equipId);
}
public void removeSoulEquip(int position){
String value = this.soulEquipByPositionMap.get(position);
if (value!=null){
removeString(getMongoKey()+".soulEquipByPositionMap." + position);
this.soulEquipByPositionMap.remove(position);
}
removeString(getMongoKey()+".soulEquipByPositionMap." + position);
this.soulEquipByPositionMap.remove(position);
}

View File

@ -967,6 +967,14 @@ public class HeroLogic{
for (Integer skillId : tempHero.getSkillListByStar(hero.getStar())) {
sb.append(skillId).append(DIVISION);
}
Map<Integer, Map<Integer, List<Integer>>> passiveSkillMap = tempHero.getPassiveSkillMap();
passiveSkillMap.get(1).getOrDefault(hero.getBreakId(),new ArrayList<>()).forEach(skillId->{
sb.append(skillId).append(DIVISION);
});
passiveSkillMap.get(2).getOrDefault(hero.getBreakId(),new ArrayList<>()).forEach(skillId->{
sb.append(skillId).append(DIVISION);
});
Map<Integer, String> equipByPositionMap = hero.getEquipByPositionMap();
if(!equipByPositionMap.isEmpty()){
Map<String, Equip> equipMap = user.getEquipManager().getEquipMap();
@ -1972,4 +1980,55 @@ public class HeroLogic{
LOGGER.info("the proId={},the value={}",item.getKey(),item.getValue());
}
}
/**
*
*
*/
public void wearSoulEquip(ISession iSession, HeroInfoProto.OptHeroSoul optHeroSoul, HeroInfoProto.OptHeroSoul unload) throws Exception {
int uid = iSession.getUid();
User user = UserManager.getUser(uid);
String heroId = optHeroSoul.getHeroId();
Hero hero = user.getHeroManager().getHero(heroId);
Map<Integer, Integer> soulEquipByPositionMap = hero.getSoulEquipByPositionMap();
checkAllowedWear(user,soulEquipByPositionMap,optHeroSoul.getSoulEquipIdsList(),unload);
optHeroSoul.getSoulEquipIdsList().forEach(e->{
hero.updateSoulEquipPositionMap(e.getPosition(),e.getEquipId());
});
MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.SOUL_EQUIP_WEAR_RESPONSE_VALUE,null,true);
}
private void checkAllowedWear(User user, Map<Integer, Integer> soulEquipByPositionMap, List<HeroInfoProto.SoulEquipPos> soulEquipIdsList, HeroInfoProto.OptHeroSoul unload) {
}
public static void mergeSoul(ISession session, int targetId, List<Integer> soulIdList) throws Exception {
int uid = session.getUid();
User user = UserManager.getUser(uid);
STableManager.getConfig(SEquipConfig.class).get(targetId);
}
public static void unloadSoulEquipOpt(ISession iSession, String heroId, List<HeroInfoProto.SoulEquipPos> equipIdsList) throws Exception {
int uid = iSession.getUid();
User user = UserManager.getUser(uid);
Hero hero = user.getHeroManager().getHero(heroId);
Map<Integer, Integer> soulEquipByPositionMap = hero.getSoulEquipByPositionMap();
for(HeroInfoProto.SoulEquipPos e : equipIdsList){
Integer equid = soulEquipByPositionMap.get(e.getPosition());
if(equid==null || equid!=e.getEquipId()){
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
}
}
Map<Integer,Integer> returnItems = new HashMap<>();
equipIdsList.forEach(e->{
soulEquipByPositionMap.remove(e.getPosition());
returnItems.put(e.getEquipId(),1);
});
ItemUtil.dropMap(user,returnItems,BIReason.UNLOAD_SOUL_REWARD);
MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.SOUL_EQUIP_UNLOAD_OPT_RESPONSE_VALUE,null,true);
}
}

View File

@ -1,5 +1,10 @@
package com.ljsd.jieling.logic.mail;
import com.google.gson.Gson;
import java.util.HashMap;
import java.util.Map;
public class MailCache {
private String title;
private String content;
@ -46,4 +51,25 @@ public class MailCache {
public void setReward(String reward) {
this.reward = reward;
}
public static void main(String[] args) {
Gson gson = new Gson();
Map<Integer,String> uidReward = new HashMap<>();
//todo uid 奖励
uidReward.put(1,"2#3");
MailCache mailCache = new MailCache();
mailCache.setTime((int)(System.currentTimeMillis()/1000));
mailCache.setContent("充值返利");
mailCache.setTitle("充值返利");
mailCache.setFrom("system");
uidReward.forEach((k,v)->{
mailCache.setReward(v);
System.out.println("HSET 10001:READY_TO_USER_MAIL: " + k + " "+ gson.toJson(gson.toJson(mailCache)));
});
System.out.println(gson.toJson(mailCache));
String s = gson.toJson(mailCache);
System.out.println(gson.toJson(s));
}
}

View File

@ -294,8 +294,8 @@ public class BuyGoodsLogic {
resultRes.setResultCode(1);
KtEventUtils.onKtEvent(user, ParamEventBean.UserPayEvent,goodsId,orderId,resultRes.getResultCode(),price);
notifyPaySuccessFul(uid,goodsId,amount != -999);
MongoUtil.getLjsdMongoTemplate().lastUpdate();
Poster.getPoster().dispatchEvent(new NewWelfareEvent(user, NewWelfareTypeEnum.RECHARGE_BUY.getType(),goodsId));
MongoUtil.getLjsdMongoTemplate().lastUpdate();
return resultRes;
}

View File

@ -85,9 +85,9 @@ public class CBean2Proto {
equipList.addAll(equipByPositionMap.values());
}
List<CommonProto.SoulPos> soulPoss = new ArrayList<>();
Map<Integer, String> soulEquipMap = hero.getSoulEquipByPositionMap();
Map<Integer, Integer> soulEquipMap = hero.getSoulEquipByPositionMap();
if(soulEquipMap!=null&&!soulEquipMap.isEmpty()){
for (Map.Entry<Integer,String> entry:soulEquipMap.entrySet()){
for (Map.Entry<Integer,Integer> entry:soulEquipMap.entrySet()){
CommonProto.SoulPos.Builder builder = CommonProto.SoulPos.newBuilder();
builder.setEquipId(entry.getValue());
builder.setPosition(entry.getKey());
@ -154,10 +154,7 @@ public class CBean2Proto {
.setRebuildLevel(tempEquip.getRebuildLevel())
.setSkillId(tempEquip.getSkill());
}
if(equip instanceof SoulEquip){
equipProto.setRebuildLevel(((SoulEquip) equip).getLevel());
equipProto.setExp(((SoulEquip) equip).getExp());
}
return equipProto.build();
}
@ -170,9 +167,7 @@ public class CBean2Proto {
for (Equip equip : temporaryItems.equips) {
drop.addEquipId(getEquipProto(equip));
}
for (SoulEquip equip : temporaryItems.soulEquips) {
drop.addSoulEquip(getEquipProto(equip));
}
return drop.build();
}

View File

@ -3,10 +3,7 @@ package config;
import manager.STableManager;
import manager.Table;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@Table(name = "HeroConfig")
public class SCHero implements BaseConfig{
@ -63,6 +60,8 @@ public class SCHero implements BaseConfig{
private Map<Integer, Map<Integer, ConsumeMaterialInfo>> consumeMaterialInfoOfPositionByStar;
private Map<Integer,Map<Integer,List<Integer>>> passiveSkillMap;
private static Map<Integer,SCHero> piecesMap;
@ -129,7 +128,9 @@ public class SCHero implements BaseConfig{
scHero.setConsumeMaterialInfoOfPositionByStar(consumeMaterialInfoByStarTmp);
//技能
Map<Integer, List<Integer>> skillTmp = new HashMap<>();
for(int i=0;i<openSkillRules.length;i++){
int[] openSkillRule = openSkillRules[i];
int star = openSkillRule[0];
@ -144,16 +145,24 @@ public class SCHero implements BaseConfig{
items.add(0);
}
}
scHero.setSkillListByStar(skillTmp);
Map<Integer,Map<Integer,List<Integer>>> passiveSkillMapTmp = new HashMap<>();
passiveSkillMapTmp.put(1,new HashMap<>());
passiveSkillMapTmp.put(2,new HashMap<>());
for(int[] openSkillRule : scHero.getOpenPassiveSkillRules()){
int star = openSkillRule[0];
int skillId = openSkillRule[1];
if(!skillTmp.containsKey(star)){
skillTmp.put(star,new ArrayList<>());
}
skillTmp.get(star).add(skillId);
int type = openSkillRule[0];
int starOrBreakId = openSkillRule[1];
int skillId = openSkillRule[2];
passiveSkillMapTmp.get(type).computeIfAbsent(starOrBreakId,a->{
return new ArrayList<>(passiveSkillMapTmp.get(type).getOrDefault(a-1,new ArrayList<>()));
});
passiveSkillMapTmp.get(type).get(starOrBreakId).add(skillId);
}
scHero.setSkillListByStar(skillTmp);
scHero.setPassiveSkillMap(passiveSkillMapTmp);
}
sCHero = integerSCHeroMap;
@ -282,4 +291,12 @@ public class SCHero implements BaseConfig{
public int[] getEquipTalismana() {
return equipTalismana;
}
public Map<Integer, Map<Integer, List<Integer>>> getPassiveSkillMap() {
return passiveSkillMap;
}
public void setPassiveSkillMap(Map<Integer, Map<Integer, List<Integer>>> passiveSkillMap) {
this.passiveSkillMap = passiveSkillMap;
}
}

View File

@ -1,7 +1,13 @@
package config;
import manager.STableManager;
import manager.Table;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@Table(name ="EquipConfig")
public class SEquipConfig implements BaseConfig {
@ -33,9 +39,18 @@ public class SEquipConfig implements BaseConfig {
private int score;
private int[] range;
private Set<Integer> rangeHeroTids;
@Override
public void init() throws Exception {
Map<Integer, SEquipConfig> config = STableManager.getConfig(SEquipConfig.class);
config.forEach((k,v)->{
Set<Integer> rangeTemp = new HashSet<>();
Arrays.stream(v.getRange()).forEach(e->rangeTemp.add(e));
v.setRangeHeroTids(rangeTemp);
});
}
@ -92,4 +107,17 @@ public class SEquipConfig implements BaseConfig {
}
public int getIfShow(){return ifShow; }
public Set<Integer> getRangeHeroTids() {
return rangeHeroTids;
}
public void setRangeHeroTids(Set<Integer> rangeHeroTids) {
this.rangeHeroTids = rangeHeroTids;
}
public int[] getRange() {
return range;
}
}