Merge branch 'master_test_gn' into master_test_gn_godsoul
# Conflicts: # protos/CommonProto.protomaster_huanxiang
commit
3b91b30cca
|
|
@ -138,6 +138,7 @@ option optimize_for = SPEED;
|
|||
optional int32 skinId = 6;//皮肤
|
||||
optional string realId = 7;//唯一id
|
||||
optional int64 forceScore = 8;//历史最高战斗力
|
||||
optional int32 playerSex=9;//用户性别(为了主角技能施法展示)
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -148,6 +149,7 @@ option optimize_for = SPEED;
|
|||
optional string specialPassive = 4; // 特殊标记(猎妖之路 圣物被动情况)
|
||||
optional int32 firstCamp = 5;//出手优先级 0默认我方先出
|
||||
optional int64 forceScore = 6;//历史最高战斗力
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1160,3 +1162,11 @@ option optimize_for = SPEED;
|
|||
optional int32 skillId = 1;//技能id
|
||||
optional int32 skillLv = 2;//技能等级
|
||||
}
|
||||
|
||||
//周卡
|
||||
message WeekCard{
|
||||
optional int32 id = 1; //周卡id
|
||||
optional bool isBuy = 2;
|
||||
optional int32 leaveGetRewardDays = 3; //还可以领取了几天奖励
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -227,8 +227,8 @@ import "CommonProto.proto";
|
|||
}
|
||||
|
||||
message FastFightChallengeResponse{
|
||||
optional int32 score = 1; //获取积分信息
|
||||
optional int32 hurt = 2 ;// 伤害值
|
||||
optional int64 score = 1; //获取积分信息
|
||||
optional int64 hurt = 2 ;// 伤害值
|
||||
optional FightData fightData = 3;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1346,6 +1346,13 @@ enum MessageType{
|
|||
// 御剑飞行:信息,奖励,竞猜统一返回
|
||||
RidingSwardInfoResponse = 3050017;
|
||||
|
||||
//周卡
|
||||
WeekCardInfoRequest = 3050030;
|
||||
WeekCardInfoResponse = 3050031;
|
||||
|
||||
WeekCardRewardRequest = 3050032;
|
||||
WeekCardRewardResponse = 3050033;
|
||||
|
||||
|
||||
//800000起为global 协议
|
||||
GetWorldServerRequest = 800001;//获取世界服ip
|
||||
|
|
|
|||
|
|
@ -1044,3 +1044,20 @@ import "CommonProto.proto";
|
|||
optional int32 round = 6;//回合数,计算加成
|
||||
}
|
||||
|
||||
//周卡
|
||||
message WeekCardInfoRequest{
|
||||
|
||||
}
|
||||
message WeekCardInfoResponse{
|
||||
repeated WeekCard allWeekCardInfo = 1;
|
||||
}
|
||||
|
||||
message WeekCardRewardRequest{
|
||||
optional int32 id = 1; //周卡id
|
||||
}
|
||||
message WeekCardRewardResponse{
|
||||
optional Drop drop = 1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue