Merge branch 'master_test_gn' into master_test_gn_endless

master_huanxiang
lvxinran 2021-05-25 11:57:22 +08:00
commit 6eca63ddbc
6 changed files with 198 additions and 6 deletions

View File

@ -26,6 +26,7 @@ message ChatInfo{
optional int32 speed = 20;
optional int32 multiple = 21; //
optional int32 userTitle = 22;
optional int32 practiceLevel = 23;//
}
message GetChatMessageInfoRequest {

View File

@ -15,7 +15,7 @@ option optimize_for = SPEED;
optional int32 uid = 1;
optional string nickName = 2;
optional int32 level = 3;
optional int32 exp = 4;
optional int64 exp = 4;
optional int32 vipLevel = 5;
optional int32 familyId = 6;
optional int32 head = 7;
@ -106,6 +106,7 @@ option optimize_for = SPEED;
optional int32 createtype = 15;// 1
optional int32 changeId = 16;//id 0
}
message PokemonInfo{
optional int32 tempId = 1; //id
optional string id = 2;
@ -120,7 +121,7 @@ option optimize_for = SPEED;
optional int32 position = 4; //
optional int32 star = 5; //
optional int32 skinId = 6;//
optional string realId = 7;//id
}
@ -240,6 +241,7 @@ option optimize_for = SPEED;
optional int32 fightMaxTime =4; //
optional int32 fightType = 5 ; //
optional string fightId = 6; //idid#id#id#
optional int32 nodeId = 7;//id
}
message ExploreDetail{
@ -312,6 +314,7 @@ option optimize_for = SPEED;
optional int32 userSkin = 11;
optional int32 userTitle = 12;
optional int32 userMount = 13;
optional int32 practiceLevel = 14;//
}
@ -424,6 +427,7 @@ option optimize_for = SPEED;
optional int32 userTitle = 16;
optional int32 userMount = 17;
optional int32 sex = 18;
optional int32 practiceLevel = 19;//
}
message GiftGoodsInfo{
optional int32 goodsId =1;//id
@ -478,6 +482,7 @@ option optimize_for = SPEED;
optional int32 userSkin = 12;
optional int32 userTitle = 13;
optional int32 userMount = 14;
optional int32 practiceLevel = 15;//
}
@ -631,6 +636,12 @@ option optimize_for = SPEED;
optional int32 days = 1; //
optional int32 state = 2;//
}
message PurpleSealShowInfo{
optional int32 id = 1;
optional int32 type = 2;
optional int32 heroTId = 3;
}
message TeamSimpleInfo{
optional string heroid = 1;
@ -646,6 +657,7 @@ option optimize_for = SPEED;
repeated TeamSimpleInfo PokemonInfos = 2;
optional int32 totalForce=3;
repeated int64 remainHp = 4;//
repeated PurpleSealShowInfo sealShow = 5;//
}
//
message TeamOneInfo{
@ -658,6 +670,7 @@ option optimize_for = SPEED;
optional TeamOneTeamInfo team = 6;
optional int32 isApplyed = 8;//
optional int32 userTitle = 9;
optional int32 practiceLevel = 10;//
}
//
@ -915,5 +928,60 @@ option optimize_for = SPEED;
optional int32 mountId = 1;
optional int32 overTime = 2;
}
//
message WelfareRedPacket{
optional int32 id = 1;
optional int32 num = 2;
}
//
message HardStagePlayerInfo{
optional int32 uid = 1;
optional int32 level = 2;
optional int32 head = 3;
optional string userName = 4;
optional int32 headFrame = 5;//
optional FightData fightData = 6;
optional int32 power = 7;
optional int32 type = 8;//1: 2
}
//
message HardStageChapterReward{
optional int32 id = 1;
optional int32 state = 2;//0.1.
}
//
message HardStageNode{
optional int32 nodeId = 1;
optional int32 type = 2; //:1.2.3.
optional int32 state = 3; //:0-78耀,01
optional bool isFirst= 4; //耀
optional bool isPass= 5; //
}
//
message HardStageChapter{
optional int32 chapterId = 1;
repeated HardStageNode node = 2;
optional int32 stars = 3;
repeated HardStageChapterReward reward = 4;
}
//
message HardStageInfo{
repeated HardStageChapter chapter = 1;
}
//
message PurpleMansionSeal{
optional int32 id = 1;//id
optional int32 type = 2;//
optional string subId = 3;//id
optional int32 state = 4;// 0:使,1:使
}
//
message KeyVal{
optional int32 key = 1;
optional int32 val = 2;
}

View File

@ -28,6 +28,7 @@ import "CommonProto.proto";
optional int32 userTitle = 21;
optional int32 userMount = 22;
optional int32 sex = 23;
optional int32 practiceLevel = 24;//
}

View File

@ -356,4 +356,34 @@ import "CommonProto.proto";
// 鸿
message HongmengSteleNewHandIndication{
optional int32 state = 1;// 鸿
}
}
//
message UpPracticeLevelRequest{}
message UpPracticeLevelResponse{
optional int32 practiceLevel = 1;//
}
//
//
// 1: oldSealId != newSealId :
// 2: oldSealId == newSealId && newSealId.subId == subId :
// 3: oldSealId == newSealId && newSealId.subId != subId :
message ReplacePurpleMansionSealRequest{
optional int32 oldSealId = 1;//id
optional int32 newSealId = 2;//id
optional string subId = 3;//id
}
message ReplacePrupleMansionSealResponse{
repeated PurpleMansionSeal sealList = 1;
};
//
message PurpleMansionSealIndication{
repeated PurpleMansionSeal sealList = 1;
}

View File

@ -81,6 +81,10 @@ enum MessageType{
ADVENTURE_CALL_BOSS_REQUEST = 10054; // boss
ADVENTURE_CALL_BOSS_RESPONSE = 10055;
WELFARE_RED_PACKET_INFO = 10056;//
WELFARE_RED_PACKET_SEND_REQUEST = 10057;//
WELFARE_RED_PACKET_SEND_RESPONSE = 10058;
// B 10100
BUY_STORE_ITEM_REQUEST = 10100; //
BUY_STORE_ITEM_RESPONSE = 10101;
@ -1009,6 +1013,25 @@ enum MessageType{
WORKSHOP_TECHNOLOGY_RESET_REQUEST = 12212; //
WORKSHOP_TECHNOLOGY_RESET_RESPONSE = 12213;
HARD_STAGE_FIGHT_START_REQUEST = 12214;//
HARD_STAGE_FIGHT_START_RESPONSE = 12215;
HARD_STAGE_INFO_REQUEST = 12216;//
HARD_STAGE_INFO_RESPONSE = 12217;
HARD_STAGE_CHAPTER_REWARD_REQUEST = 12218;//
HARD_STAGE_CHAPTER_REWARD_RESPONSE = 12219;
HARD_STAGE_REPORT_REQUEST = 12220;//
HARD_STAGE_REPORT_RESPONSE = 12221;
VIP_LEVEL_STATE_REQUEST = 12222;//
VIP_LEVEL_STATE_RESPONSE = 12223;
VIP_LEVEL_STATE_REWARD_REQUEST = 12224;//
VIP_LEVEL_STATE_REWARD_RESPONSE = 12225;
// X 12300
@ -1185,6 +1208,17 @@ enum MessageType{
ActiveUserMountRequest = 303907;
ActiveUserMountResponse = 303908;
//
UpPracticeLevelRequest = 304101;
UpPracticeLevelResponse = 304102;
//
ReplacePurpleMansionSealRequest = 304103;
ReplacePurpleMansionSealResponse = 304104;
PurpleMansionSealIndication = 304105;
//800000global
GetWorldServerRequest = 800001;//ip
GetWorldServerResponse = 800002;

View File

@ -77,6 +77,9 @@ import "CommonProto.proto";
repeated UserSkinInfo userSkinList = 37;//
repeated UserTitleInfo userTitleList = 38;//
repeated UserMountInfo userMountList = 39;//
optional int32 dailyredpack = 40;//
optional int32 practiceLevel = 41;//
repeated PurpleMansionSeal sealList = 42;//
}
@ -529,7 +532,7 @@ import "CommonProto.proto";
message UpdateUserExpIndicaiton{
optional int32 level = 1 ;//
optional int32 exp =2 ; //
optional int64 exp =2 ; //
}
@ -837,4 +840,59 @@ import "CommonProto.proto";
//
message PushWelfareResponse{
repeated int32 id = 1;
}
}
//
message WelfareRedPacketPush{
repeated WelfareRedPacket redpacket = 1;
}
//
message WelfareRedPacketSendRequest{
optional int32 id = 1;
}
message WelfareRedPacketSendResponse{
repeated WelfareRedPacket redpacket = 1;
}
//
message HardStageRequest{
}
message HardStageResponse{
optional HardStageInfo info = 1;
}
//
message HardStageFightRequest{
optional int32 nodeId = 1;
optional int32 teamId = 2;
}
message HardStageFightResponse{
optional FightData fightData = 1;
optional Drop drop = 2;
optional int32 stars = 3; //:0-78耀
}
//
message GetHardStageChapterReward{
optional int32 chapterId = 1;
optional int32 rewradId = 2;
}
message GetHardStageChapterRewardResponse{
optional Drop drop = 1;
}
//访
message HardStageReportRequset{
optional int32 hardStageId = 1;
}
message HardStageReportResponse{
repeated HardStagePlayerInfo player = 1;
}
//
message VipLevelStateRequset{
}
message VipLevelStateResponse{
repeated KeyVal vipState = 1;//<id,(0,1)>
}
//
message VipLevelStateRewardRequset{
optional int32 vipLevelId = 1;
}
message VipLevelStateRewardResponse{
optional Drop drop = 1;
}