Merge branch 'master_test_gn' into master_test_gn_ys

# Conflicts:
#	protos/PlayerInfoProto.proto
master_huanxiang
yuanshuai 2021-09-14 12:00:45 +08:00
commit 43d0bf08ef
4 changed files with 2 additions and 45 deletions

View File

@ -1025,20 +1025,6 @@ option optimize_for = SPEED;
optional string windowLink = 3;//
}
//
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;//

View File

@ -466,9 +466,9 @@ import "CommonProto.proto";
}
message ChallengeDeathPathResponse{
optional FightData fightData = 1;
optional int32 damage = 2;
optional int64 damage = 2;
optional Drop drop = 3;
optional int32 historyMax = 4;//
optional int64 historyMax = 4;//
}
message CarGrapRecordResponse{

View File

@ -413,30 +413,7 @@ 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,12 +1100,6 @@ 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;