Merge branch 'master_test_gn' into dh_dev_ridingsward

# Conflicts:
#	protos/CommonProto.proto
duhui 2021-10-14 16:19:17 +08:00
commit cb57cb7491
4 changed files with 19 additions and 2 deletions

View File

@ -1124,4 +1124,11 @@ option optimize_for = SPEED;
message RidingSwardBet{
optional int32 swardId = 1;//
optional int32 costNum = 2;//
}
}
//
message EquipBookInfo{
optional int32 equipId = 1;//id
optional int32 num = 2;//
}

View File

@ -162,6 +162,7 @@ import "CommonProto.proto";
message GetAllPropertyInfoResponse{
repeated int32 allBookEnabled = 1;//
repeated int32 equipGot = 2;//
repeated EquipBookInfo equipList = 3;//
}
@ -456,9 +457,16 @@ import "CommonProto.proto";
optional int32 itemId = 2;//id
optional int32 itemNum = 3;//
}
///
message EquipBookIndication{
repeated EquipBookInfo changeEquipList = 1;//()
}

View File

@ -749,6 +749,7 @@ enum MessageType{
ALL_BOOK_ENABLE_REQUEST = 11514;//
ALL_BOOK_ENABLE_REPONSE = 11515;
EQUIP_BOOK_INDICATION = 11516;//
// Q 11600
QUESTION_INDICATION = 11600;//
QUICK_START_MONSTERFIGHTER_REQUEST = 11601;//

View File

@ -539,7 +539,8 @@ import "CommonProto.proto";
message UpdateUserExpIndicaiton{
optional int32 level = 1 ;//
optional int64 exp =2 ; //
optional int64 exp = 2 ; //
optional Drop drop = 3; //
}