Merge branch 'master_test_gn' into dh_dev_ridingsward
# Conflicts: # protos/CommonProto.proto
commit
cb57cb7491
|
@ -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;//装备曾经获取过的数量
|
||||
}
|
||||
|
||||
|
|
|
@ -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;//装备图鉴修改数据(推的是当前数量)
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -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;//兽潮快速战斗
|
||||
|
|
|
@ -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; // 玩家升级给的道具
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue