Merge branch 'master_test_gn' into 开发/dev_dh

master_huanxiang
duhui 2021-12-23 18:09:28 +08:00
commit a1e0e1fdc3
4 changed files with 52 additions and 1 deletions

View File

@ -1224,3 +1224,16 @@ option optimize_for = SPEED;
optional int32 location = 1;//equipConfig
optional int32 lvId = 2;//id
}
//
message LifeStoneInfo{
optional int32 itemId = 1;//id
optional int32 costNum = 2;//
}
//
message LifeGridInfo{
optional int32 gridId = 1;//id
optional int32 gridIndex = 2;//
optional int32 itemId = 3;//id
}

View File

@ -500,4 +500,34 @@ import "CommonProto.proto";
optional int32 id = 1;//id
optional int32 index = 2;//
}
//
message LifeStoneUpRequest{
optional int32 type = 1;// 1: 2: 3: 4:
optional int32 gridId = 2;//id 0
optional int32 gridIndex = 3;//
optional int32 curGemId = 4;//id
optional int32 selectNum = 5;//
}
//
message LifeStoneUpResponse{
optional LifeGridInfo lifeGridInfo = 1;//
optional Drop drop = 2;//
}
//穿/
message LifeGridChangeRequest{
optional int32 type = 1;// 1:穿 2:
optional int32 position = 2;//id
optional int32 index = 3;//
optional int32 lifeStoneId = 4;//id
}
//
message LifeGridChangeResponse{
optional LifeGridInfo lifeGridInfo = 1;//
}

View File

@ -1132,8 +1132,15 @@ enum MessageType{
TRUMP_GACHA_SELECT_ITEM_REQUEST = 20215;//
TRUMP_GACHA_SELECT_ITEM_RESPONSE = 20216;
GET_TRUMP_SELECT_ITEM_REQUEST = 20217;//up
GET_TRUMP_SELECT_ITEM_REQUEST = 20217;//up
GET_TRUMP_SELECT_ITEM_RESPONSE = 20218;
LIFE_STONE_UP_REQUEST = 20219;//
LIFE_STONE_UP_RESPONSE = 20220;
LIFE_GRID_CHANGE_REQUEST = 20221;//穿/
LIFE_GRID_CHANGE_RESPONSE = 20222;
//30000 使

View File

@ -89,6 +89,7 @@ import "CommonProto.proto";
optional int32 xiuweiLevel = 48; //
repeated PracticeSkillInfo practiceSkillInfos = 49;//
repeated FaBaoSoulInfo FaBaoSoulInfos = 50;//
repeated LifeGridInfo lifeGridInfos = 51;//
}