Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_protocol into master_test_gn

# Conflicts:
#	protos/CommonProto.proto
#	protos/PlayerInfoProto.proto
master_huanxiang
yuanshuai 2021-09-09 16:57:21 +08:00
commit a6721e2f5c
5 changed files with 117 additions and 10 deletions

View File

@ -53,6 +53,7 @@ import "CommonProto.proto";
//
message UpgradeGodTreeRequest{
optional int32 count = 1;
}
message UpgradeGodTreeResponse{
}

View File

@ -78,6 +78,8 @@ option optimize_for = SPEED;
optional int32 skillId = 7;//
optional int32 isLocked = 8; // 1 0:
optional int32 exp = 9; //
optional int32 treeLv = 10;//
optional int32 fourSpirit = 11;//
}
message SoulPos{
@ -106,7 +108,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;
@ -288,16 +290,16 @@ option optimize_for = SPEED;
required int32 state = 3; //01 -1
}
required int32 activityId = 1; // id
repeated MissionInfo mission = 2; //
required int32 activityId = 1; // id
repeated MissionInfo mission = 2; //
optional int32 endTime = 3; //
optional int32 reallyOpen = 4; // 0: 1
optional int32 startTime = 5; //
optional int32 reallyOpen = 4; // 0: 1
optional int32 startTime = 5; //
optional int32 value = 6; //
optional int32 choiceRewardId = 7; //,id
}
}
message GmResponse{
message GmResponse{
optional Drop drop =1;
optional string info =2;
}
@ -486,6 +488,7 @@ option optimize_for = SPEED;
optional int32 userTitle = 13;
optional int32 userMount = 14;
optional int32 practiceLevel = 15;//
optional int32 firstOrMini = 16;//01
}
@ -674,6 +677,7 @@ option optimize_for = SPEED;
optional int32 isApplyed = 8;//
optional int32 userTitle = 9;
optional int32 practiceLevel = 10;//
repeated TeamOneTeamInfo crossTeam = 11;//
}
//
@ -941,6 +945,7 @@ option optimize_for = SPEED;
optional int32 num = 2;
}
//
message HardStagePlayerInfo{
optional int32 uid = 1;
@ -1033,4 +1038,25 @@ option optimize_for = SPEED;
optional int32 level = 2;//
repeated SixiangxinfaPropertyInfo propertyInfoList=3;//
}
//
message FourChallengeInfo{
optional int32 type = 1;//
optional int32 overTime = 2;//
optional int32 currentFloor = 3;//
optional int32 remainTimes = 4;//
}
//
message HelpFightList{
optional int32 uid = 1;
optional string userName = 2;
optional int32 guildName = 3;//0 1
optional int32 trailType = 4;//
optional Hero hero = 5; //
optional int32 state = 6;//0:使1使
repeated Equip jewels = 7;//
optional int32 treeLevel = 8;//
optional int32 fourTotal = 9;//
}

View File

@ -105,7 +105,7 @@ import "CommonProto.proto";
}
message FightRePlayRequest{
optional int32 type =1; // 1
optional int32 type =1; // 123boss4
optional string fightId =2; // fight Id
}

View File

@ -402,6 +402,7 @@ enum MessageType{
FU_XING_STORE_BUY_REQUEST = 10588;//
FU_XING_STORE_BUY_RESPONSE = 10589;
// G 10600
GET_PLAYERINFO_REQUEST = 10600; //
GET_PLAYERINFO_RESPONSE = 10601;
@ -1210,6 +1211,33 @@ enum MessageType{
ZeroPlayerUpdateIndication = 303703;
// 303704 - 303709
//
GetHelpHeroListRequest = 303704;
GetHelpHeroListResponse = 303705;
//
SetHelpHeroRequest = 303706;
SetHelpHeroResponse = 303707;
// 使
UseHelpHeroRequest = 303708;
UseHelpHeroResponse = 303709;
//
GetFourChallengeRecordRequest = 303710;
GetFourChallengeRecordResponse = 303711;
//
SendFourChallengeInfoIndication = 303712;
//
FOUR_CHALLENGE_GET_INFO_REQUEST = 303713;//
FOUR_CHALLENGE_GET_INFO_RESPONSE = 303714;
FOUR_CHALLENGE_DO_REQUEST = 303715;//
FOUR_CHALLENGE_DO_RESPONSE = 303716;
//
DemonsTrialRewardRequest = 303801;
DemonsTrialRewardResponse = 303802;
@ -1262,6 +1290,7 @@ enum MessageType{
qiMenDunJiaHitListRequest = 3040112;
qiMenDunJiaHitListResponse = 3040113;
// -
beautyBagCardIndication = 3040126;

View File

@ -84,6 +84,7 @@ import "CommonProto.proto";
optional int32 randomCount = 43;//
repeated randomTypeNum drawTimes = 44;//
repeated SixiangxinfaInfo sixiangInfos = 45;//
repeated HelpFightList helpFightList = 46;//
}
@ -520,6 +521,7 @@ import "CommonProto.proto";
optional int32 playerId = 1;
optional int32 teamId = 2;
optional int32 serverId = 3;
repeated int32 crossteamId = 4;//teamId
}
message GetPlayerOneTeamInfoResponse{
optional TeamOneInfo teamInfo = 1;
@ -670,7 +672,7 @@ import "CommonProto.proto";
message ViewHeroInfoResponse{
optional Hero hero =1;
repeated Equip equip =2; // 穿Hero
repeated Equip equip =2; // 穿
repeated SpecialEffects SpecialEffects = 3;//
optional int32 force = 4 ; //
optional int32 guildSkill = 5;//
@ -794,9 +796,58 @@ import "CommonProto.proto";
optional int32 weekTime = 2;
}
//
message FourChallengeGetInfoResponse{
repeated FourChallengeInfo info = 1;
}
//
message FourChallengeDoRequest{
optional int32 challengeId = 1;
optional int32 type = 2;//01
}
message FourChallengeDoResponse{
optional Drop drop = 1;
optional FightData fightData = 2;//01
}
//
message GetHelpHeroListRequest{
optional int32 type = 1; //0:
}
message GetHelpHeroListResponse{
repeated HelpFightList helpHeros = 1;//
}
//
message SetHelpHeroRequest{
optional string heroId = 1;//id
}
message SetHelpHeroResponse{
optional Drop drop = 1;//
}
// 使
message UseHelpHeroRequest{
optional string heroId = 1;//id
optional int32 type = 2;//
optional int32 status = 3;//01
}
//
message GetFourChallengeRecordRequest{
optional int32 type = 1;//
optional int32 tier = 2;//
}
message GetFourChallengeRecordResponse{
repeated UserRank userRank = 1;//
}
//
message WorldLevelIndication{
optional int32 worldLeve = 1;//
optional int32 worldLeve = 1;
}
// 使