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

# Conflicts:
#	protos/PlayerInfoProto.proto
master_huanxiang
jiahuiwen 2021-09-23 14:30:46 +08:00
commit a88b31350f
6 changed files with 249 additions and 19 deletions

View File

@ -110,6 +110,7 @@ import "CommonProto.proto";
// /
message qiMenDunJiaDrawRequest{
optional int32 activityId = 1;
optional int32 num = 2;//1:,10:
}
message qiMenDunJiaDrawResponse{

View File

@ -147,8 +147,85 @@ import "CommonProto.proto";
message TakeArenaBattleRewardResponse{
optional Drop drop = 1;
}
//
message CrossYuXuLunDaoGetInfoRequest{
}
message CrossYuXuLunDaoGetInfoResponse{
optional bool isFirst= 1;//
repeated ArenaPersonInfo arenaEnemys = 2; //
optional int32 oldMyscore = 3; //
optional int32 newMyscore = 4; //
optional int32 oldLevelId = 5; //
optional int32 newLevelId = 6; //
optional int32 myRank = 7 ;//
repeated Drop drop =8 ;//
repeated int32 dailyRewardState =9;//
optional int32 changedTimes = 10 ;//
repeated Drop updrop =11 ;//
}
//
message CrossYuXuLunDaoChallengeBeforeRequest{
optional int32 playerId = 1;
optional int32 defId = 2;
}
message CrossYuXuLunDaoChallengeBeforeResponse{
optional TeamOneInfo myTeamInfo = 1;//
optional TeamOneInfo defTeamInfo = 2;//
}
//
message CrossYuXuLunDaoChallengeRequest{
repeated int32 teamId = 1; //id id id
optional int32 challengeUid = 2 ;// uid
optional int32 challengeType = 3 ;// 0|1
}
message CrossYuXuLunDaoChallengeResponse{
optional int32 myScore = 1 ; // +25
optional int32 defScore =2; // -25
repeated ArenaPersonInfo arenaEnemys = 3; //
repeated FightData fightData =4; //
repeated int32 fightResult = 5 ;//
repeated Drop drop = 6;
optional int32 myRank =7 ;//
optional int32 changedTimes = 8 ;//
optional int32 myNewScore = 9; //
}
//
message CrossYuXuLunDaoChangeEnemyInfoRequest{
}
message CrossYuXuLunDaoChangeEnemyInfoResponse{
repeated ArenaPersonInfo arenaEnemys = 1; //
}
//
message CrossYuXuLunDaoGetDailyRewardRequest{
optional int32 type = 1; // 0
}
message CrossYuXuLunDaoGetDailyRewardResponse{
optional bool isSuccess = 1 ;//
optional Drop drop = 2 ;//
}
//
message CrossYuXuLunDaoBattleRecordRequest{
optional int32 uid =1 ;
}
message CrossYuXuLunDaoBattleRecordResponse{
repeated crossYxldPlayerRecordInfo recordData = 1;//,
}
//
message CrossYuXuLunDaoBattleDetailRecordRequest{
optional int32 uid =1 ;
optional int32 num =2 ;// 1
}
message CrossYuXuLunDaoBattleDetailRecordResponse{
optional crossYxldPlayerRecordInfo recordData = 1;
}

View File

@ -488,7 +488,8 @@ option optimize_for = SPEED;
optional int32 userTitle = 13;
optional int32 userMount = 14;
optional int32 practiceLevel = 15;//
optional int32 firstOrMini = 16;//01
optional int32 crossScore = 16; //
optional int32 firstOrMini = 17;//01
}
@ -677,7 +678,9 @@ option optimize_for = SPEED;
optional int32 isApplyed = 8;//
optional int32 userTitle = 9;
optional int32 practiceLevel = 10;//
repeated TeamOneTeamInfo crossTeam = 11;//
repeated TeamOneTeamInfo crossTeam = 11;//
optional int32 crossTeamScore = 12;//
optional string serverName = 13; //
}
//
@ -1025,6 +1028,42 @@ option optimize_for = SPEED;
optional string windowLink = 3;//
}
//
message crossYxldPlayerRecordInfo{
optional int32 uid = 1;
optional int32 level = 2;
optional int32 head = 3;
optional string userName = 4;
optional int32 headFrame = 5;//
optional int32 time = 6;
optional FightData fightData1 = 7;//
optional FightData fightData2 = 8;//
optional FightData fightData3 = 9;//
optional int32 power = 10; //
optional int32 type = 11; // 1 2 3 4
optional int32 practiceLevel = 12; //
optional int32 myScoreChange = 13; //
repeated int32 resultList = 14;//
optional int32 score = 15; //
optional string serverName = 16; //
repeated int32 result = 17; //
optional string myServerName = 18; //
}
//
message SixiangxinfaPropertyInfo{
optional int32 propertyId = 1;//id
optional int32 propertyNum=2;//
}
//
message SixiangxinfaInfo{
optional int32 professionId = 1;//id
optional int32 level = 2;//
repeated SixiangxinfaPropertyInfo propertyInfoList=3;//
}
//
message FourChallengeInfo{
optional int32 type = 1;//
@ -1045,4 +1084,10 @@ option optimize_for = SPEED;
optional int32 treeLevel = 8;//
optional int32 fourTotal = 9;//
}
//
message Relic{
optional int32 id = 1;//id
optional int32 status = 2;//01
}

View File

@ -420,7 +420,30 @@ import "CommonProto.proto";
repeated beautyBagCardInfo infoList = 1;
}
//
message SixiangUpRequest{
optional int32 professionId = 1;
}
message SixiangUpResponse{
repeated SixiangxinfaPropertyInfo infoList = 1;
}
//
message SixiangUpStarRequest{
optional int32 professionId = 1;
}
message SixiangUpStarResponse{
optional int32 starLv = 1;
repeated SixiangxinfaPropertyInfo infoList = 2;
}

View File

@ -1100,6 +1100,12 @@ enum MessageType{
//20111 - 20200
EQUIP_COMPLEX_REQUEST = 20111;//
EQUIP_COMPLEX_RESPONSE = 20112;
SIXIANG_UP_REQUEST = 20201;//
SIXIANG_UP_RESPONSE = 20202;
SIXIANG_UP_STAR_REQUEST = 20203;//
SIXIANG_UP_STAR_RESPONSE = 20204;
@ -1286,7 +1292,7 @@ enum MessageType{
qiMenDunJiaHitListResponse = 3040113;
// -
// -
beautyBagCardIndication = 3040126;
beautyBagWishEquipRequest = 3040127;
@ -1294,6 +1300,21 @@ enum MessageType{
beautyBagWishEquipResponse = 3040128;
//
//
SevenWorldInfoRequest = 3050001;
SevenWorldInfoResponse = 3050002;
SevenWorldInfoIndication = 3050003;
//
SevenWorldRelicRequest = 3050004;
SevenWorldRelicResponse = 3050005;
//
SevenWorldChallengeRequest = 3050010;
SevenWorldChallengeResponse = 3050011;
//800000global
@ -1315,8 +1336,7 @@ enum MessageType{
//
GetWorldArenaRecordInfoRequest= 900007;
GetWorldArenaRecordInfoResponse= 900008;
//gs --word
GetGSUserArenaInfoRequest = 900009;
GetGSUserArenaInfoResponse = 900010;
@ -1343,13 +1363,36 @@ enum MessageType{
ArenaClearInfoRequest = 900021;
GetWorldArenaInfoIndication = 900022;
//
CrossYuXuLunDaoGetInfoRequest = 900023;
CrossYuXuLunDaoGetInfoResponse = 900024;
CrossYuXuLunDaoChallengeRequest = 900025;
CrossYuXuLunDaoChallengeResponse = 900026;
CrossYuXuLunDaoChangeEnemyInfoRequest = 900027;
CrossYuXuLunDaoChangeEnemyInfoResponse = 900028;
CrossYuXuLunDaoGetDailyRewardRequest = 900029;
CrossYuXuLunDaoGetDailyRewardResponse = 900030;
GetPlayerCrossYxldOneTeamInfoRequest = 900031;
GetPlayerCrossYxldOneTeamInfoResponse = 900032;
CrossYuXuLunDaoChallengeBeforeRequest = 900033;
CrossYuXuLunDaoChallengeBeforeResponse = 900034;
CrossYuXuLunDaoBattleRecordRequest= 900035;
CrossYuXuLunDaoBattleRecordResponse= 900036;
CrossYuXuLunDaoBattleDetailRecordRequest =900037;
CrossYuXuLunDaoBattleDetailRecordResponse =900038;
ReplayWorldArenaRequest = 9000023;
ReplayWorldArenaResponse = 9000024;
IsCrossRequert = 9000025;
IsCrossResponse = 9000026;
IsCrossIndication = 9000027;
}

View File

@ -84,7 +84,8 @@ import "CommonProto.proto";
optional int32 randomCount = 43;//
repeated randomTypeNum drawTimes = 44;//
repeated HelpFightList helpFightList = 45;//
optional int32 serverOpenTime = 46; //
repeated SixiangxinfaInfo sixiangInfos = 46;//
optional int32 serverOpenTime = 47; //
}
@ -521,7 +522,6 @@ 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;
@ -972,22 +972,63 @@ import "CommonProto.proto";
optional int32 isCross = 1;// 01
}
message CheckBuyGoodsRequest{
optional int32 goodsId = 1;
}
message CheckBuyGoodsResponse{
optional string orderId = 1;
message CheckBuyGoodsRequest{
optional int32 goodsId = 1;
}
message CheckBuyGoodsResponse{
optional string orderId = 1;
}
message XunBaoMiZongEnterRequest{
}
message XunBaoMiZongEnterResponse{
optional bool isEnter = 1;
}
message XunBaoMiZongEnterResponse{
optional bool isEnter = 1;
}
//
message TaiChuSecretvolumeRequest{
}
}
message TaiChuSecretvolumeResponse{
repeated taiChuSecretvolume secretvolume = 1;
}
}
//
message GetPlayerCrossYxldOneTeamInfoRequest{
optional int32 playerId = 1;
optional int32 serverId = 2;
}
message GetPlayerCrossYxldOneTeamInfoResponse{
optional TeamOneInfo teamInfo = 1;
}
//
message SevenWorldInfoRequest{
optional int32 tierId = 1;//id
}
message SevenWorldInfoResponse{
optional int32 id = 1; //id
optional int32 ranking = 2; //
optional int32 integral = 3; //
optional int32 totalTier = 4; //
}
message SevenWorldRelicRequest{
optional int32 relicId = 1;//id
}
message SevenWorldRelicResponse{
repeated Relic info = 1;//
}
message SevenWorldChallengeRequest{
optional int32 tierId = 1;// id
optional int32 privilageTypeId = 2;//id
}
message SevenWorldChallengeResponse{
optional int32 result = 1;//
optional FightData fightData = 2;//
optional Drop drop = 3;//
repeated int32 teamBuffIds = 4;//id
repeated int32 relicIds = 5;//id
optional int32 round = 6;//
}