Merge branch 'master_test_gn' into master_test_gn_godsoul
# Conflicts: # protos/CommonProto.proto # protos/HeroInfoProto.protomaster_huanxiang
yuanshuai
commit
fdce1162e1
|
|
@ -126,4 +126,39 @@ import "CommonProto.proto";
|
|||
repeated int32 hitList = 1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// 御剑飞行
|
||||
message RidingSwardActivityRequest{
|
||||
optional int32 activityId = 1;//活动id
|
||||
}
|
||||
message RidingSwardActivityResponse{
|
||||
optional int32 state = 1;//当前状态，0：关闭，1：投注，2：比赛中
|
||||
optional int64 time = 2;//下轮开始时间
|
||||
repeated ModelUserInfo modelInfo = 3;//假人信息
|
||||
optional int32 rankId = 4;//当前比赛脚本
|
||||
optional int32 betCount = 5;//投注次数
|
||||
}
|
||||
// 获取信息
|
||||
message RidingSwardInfoRequest{
|
||||
}
|
||||
// 领取奖励
|
||||
message RidingSwardRewardRequest{
|
||||
optional int32 round = 1;//轮次,-1为全部领取
|
||||
optional int32 swardId = 2;//押注的剑
|
||||
}
|
||||
message RidingSwardRewardResponse{
|
||||
optional Drop drop = 1;//奖励道具
|
||||
}
|
||||
// 竞猜
|
||||
message RidingSwardBetRequest{
|
||||
optional int32 swardId = 1;//选择的剑
|
||||
optional int32 costNum = 2;//投注数量
|
||||
}
|
||||
|
||||
// 统一返回
|
||||
message RidingSwardInfoResponse{
|
||||
repeated RidingSwardRecord recordLsit = 1;//记录
|
||||
repeated RidingSwardBet betList = 2;//竞猜记录
|
||||
optional RidingSwardLastRank lastRank = 3;//上次排名
|
||||
optional int32 betCount = 4;//投注次数
|
||||
}
|
||||
|
|
@ -149,6 +149,7 @@ import "CommonProto.proto";
|
|||
}
|
||||
//玉虚论道面板数据
|
||||
message CrossYuXuLunDaoGetInfoRequest{
|
||||
optional int32 type = 1; //0:红点数据请求 1:正常请求
|
||||
}
|
||||
message CrossYuXuLunDaoGetInfoResponse{
|
||||
optional bool isFirst= 1;//是否赛季第一次请求
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
package rpc.protocols;
|
||||
|
||||
option optimize_for = SPEED;
|
||||
|
|
@ -120,12 +119,13 @@ option optimize_for = SPEED;
|
|||
|
||||
message FightUnitInfo {
|
||||
optional string unitId = 1;//单位静态id
|
||||
optional string unitSkillIds = 2;//点技#滑技#被动技能1#被动技能2#被动技能3....
|
||||
optional string unitSkillIds = 2;//点技#滑技#被动技能1#被动技能2#被动技能3....(新增修行技能数据放这里：PlayerSkill表id)
|
||||
optional string property = 3;//1#2390#2390#169#271#95#176#0#0#0.3#0.15#0.3#1.5#1#0.05#0#0#0#0#0#0.05#0#0#0#0#0
|
||||
optional int32 position = 4; // 位置
|
||||
optional int32 position = 4; // 位置(修行技能 position：10)
|
||||
optional int32 star = 5; // 星级
|
||||
optional int32 skinId = 6;//皮肤
|
||||
optional string realId = 7;//唯一id
|
||||
optional int64 forceScore = 8;//历史最高战斗力
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -135,6 +135,7 @@ option optimize_for = SPEED;
|
|||
optional string teamPassiveList = 3 ; //目前无用
|
||||
optional string specialPassive = 4; // 特殊标记（猎妖之路 圣物被动情况）
|
||||
optional int32 firstCamp = 5;//出手优先级 0默认我方先出
|
||||
optional int64 forceScore = 6;//历史最高战斗力
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1050,6 +1051,8 @@ option optimize_for = SPEED;
|
|||
optional string serverName = 16; //服务器名称
|
||||
repeated int32 result = 17; //战斗结果
|
||||
optional string myServerName = 18; //我的服务器名称
|
||||
repeated int32 yxldMyForce = 19;//自己三个队伍的战力
|
||||
repeated int32 yxldDefForce = 20;//队手三个队伍的战力
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1098,6 +1101,7 @@ option optimize_for = SPEED;
|
|||
optional int32 heroStaticid = 1;//英雄静态id
|
||||
optional int32 likableNum = 2;//好感度值
|
||||
}
|
||||
|
||||
///神魂绑定数据
|
||||
message HeroGodSoulInfo{
|
||||
optional int32 level = 1;//神魂等级
|
||||
|
|
@ -1108,4 +1112,47 @@ option optimize_for = SPEED;
|
|||
message HeroBeBindGodSoulInfo{
|
||||
optional int32 level = 1;//神魂等级
|
||||
optional string heroId = 2;//当前等级绑定的神将
|
||||
}
|
||||
}
|
||||
|
||||
// 御剑飞行，人物信息
|
||||
message ModelUserInfo{
|
||||
optional string userName = 1;//玩家名字
|
||||
optional int32 practiceLevel = 2;//修行等级
|
||||
optional int32 sex = 3;//性别
|
||||
}
|
||||
|
||||
// 御剑飞行，上次排行
|
||||
message RidingSwardLastRank{
|
||||
optional int64 rankTime = 1;//时间
|
||||
optional int32 rankId = 2;//剧本id
|
||||
}
|
||||
|
||||
// 御剑飞行，记录信息
|
||||
message RidingSwardRecord{
|
||||
optional int64 time = 1;//时间
|
||||
optional int32 result = 2;//结果
|
||||
optional int32 winnerId = 3;//获胜者
|
||||
optional int32 costNum = 4;//消耗
|
||||
optional int32 getNum = 5;//可领取
|
||||
optional int32 state = 6;//状态
|
||||
optional int32 betSwardId = 7;//押注剑id
|
||||
optional int32 round = 8;//轮次
|
||||
}
|
||||
|
||||
// 御剑飞行，竞猜信息
|
||||
message RidingSwardBet{
|
||||
optional int32 swardId = 1;//选择的剑
|
||||
optional int32 costNum = 2;//投注数量
|
||||
}
|
||||
|
||||
// 装备图鉴信息
|
||||
message EquipBookInfo{
|
||||
optional int32 equipId = 1;//装备静态id
|
||||
optional int32 num = 2;//装备曾经获取过的数量
|
||||
}
|
||||
|
||||
///修行技能信息
|
||||
message PracticeSkillInfo{
|
||||
optional int32 skillId = 1;//技能id
|
||||
optional int32 skillLv = 2;//技能等级
|
||||
}
|
||||
|
|
|
|||
|
|
@ -162,6 +162,7 @@ import "CommonProto.proto";
|
|||
message GetAllPropertyInfoResponse{
|
||||
repeated int32 allBookEnabled = 1;//已经激活的羁绊
|
||||
repeated int32 equipGot = 2;//已经获得过的魂印
|
||||
repeated EquipBookInfo equipList = 3;//已经获得过的装备
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -372,6 +373,11 @@ import "CommonProto.proto";
|
|||
message UpPracticeLevelResponse{
|
||||
optional int32 practiceLevel = 1;//等级
|
||||
}
|
||||
|
||||
// 修行玩法 主角修为等级提升
|
||||
message XiuxianLevelUpResponse{
|
||||
optional int32 xiuxianLevel = 1;// 主角修为等级
|
||||
}
|
||||
|
||||
|
||||
// 修行玩法 替换紫府神印
|
||||
|
|
@ -456,8 +462,12 @@ import "CommonProto.proto";
|
|||
optional int32 itemId = 2;//消耗道具id
|
||||
optional int32 itemNum = 3;//消耗道具数量
|
||||
}
|
||||
|
||||
|
||||
///装备图鉴数据推送
|
||||
message EquipBookIndication{
|
||||
repeated EquipBookInfo changeEquipList = 1;//装备图鉴修改数据(推的是当前数量)
|
||||
}
|
||||
|
||||
//英雄神魂绑定协议
|
||||
message HeroGodSoulBindRequest{
|
||||
optional string heroId = 1;//当前神魂升级神将
|
||||
|
|
@ -465,6 +475,12 @@ import "CommonProto.proto";
|
|||
repeated string bindHeros=3;//被绑定神将
|
||||
}
|
||||
|
||||
//修行技能升级
|
||||
message PracticeSkillUpRequest{
|
||||
optional int32 skillId = 1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -572,6 +572,8 @@ enum MessageType{
|
|||
|
||||
HONGMENG_STELE_NEW_HAND_INDICATION = 10725;//鸿蒙碑新手引导推送
|
||||
|
||||
HARD_STAGE_TAKE_DAILY_REWAR_REQUEST = 10726;//山河社稷图领取每日奖励
|
||||
HARD_STAGE_TAKE_DAILY_REWAR_RESPONSE = 10727;
|
||||
|
||||
// I 10800
|
||||
// J 10900
|
||||
|
|
@ -749,6 +751,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;//兽潮快速战斗
|
||||
|
|
@ -1052,6 +1055,9 @@ enum MessageType{
|
|||
TAI_CHU_SECRET_VOLUME_RESPONSE = 12231;//太初密卷
|
||||
|
||||
// X 12300
|
||||
XIUXIAN_XIUWEI_UP_REQUEST = 12300; // 主角修为提升
|
||||
XIUXIAN_XIUWEI_UP_RESPONSE = 12301; //
|
||||
|
||||
// Y 12400
|
||||
// Z 12500
|
||||
|
||||
|
|
@ -1112,6 +1118,9 @@ enum MessageType{
|
|||
|
||||
GET_LIKABLE_DATA_REQUEST = 20207;//获取英雄好感度数据请求
|
||||
GET_LIKABLE_DATA_RESPONSE = 20208;
|
||||
|
||||
PRACTICE_SKILL_UP_REQUEST=20209;//修行技能升级请求
|
||||
PRACTICE_SKILL_UP_RESPONSE=20210;
|
||||
|
||||
HERO_GOD_SOUL_BIND_REQUEST = 20209;//神将绑定神魂请求
|
||||
HERO_GOD_SOUL_BIND_RESPONSE = 20210;
|
||||
|
|
@ -1322,6 +1331,20 @@ enum MessageType{
|
|||
SevenWorldChallengeResponse = 3050011;
|
||||
|
||||
|
||||
// 御剑飞行活动界面
|
||||
RidingSwardActivityRequest = 3050012;
|
||||
RidingSwardActivityResponse = 3050013;
|
||||
|
||||
// 御剑飞行信息-排行、记录、竞猜
|
||||
RidingSwardInfoRequest = 3050014;
|
||||
// 御剑飞行领取奖励
|
||||
RidingSwardRewardRequest = 3050015;
|
||||
RidingSwardRewardResponse = 3050018;
|
||||
// 御剑飞行竞猜
|
||||
RidingSwardBetRequest = 3050016;
|
||||
|
||||
// 御剑飞行：信息，奖励，竞猜统一返回
|
||||
RidingSwardInfoResponse = 3050017;
|
||||
|
||||
|
||||
//800000起为global 协议
|
||||
|
|
|
|||
|
|
@ -86,6 +86,8 @@ import "CommonProto.proto";
|
|||
repeated HelpFightList helpFightList = 45;//已选取的助战信息
|
||||
repeated SixiangxinfaInfo sixiangInfos = 46;//四象心法数据
|
||||
optional int32 serverOpenTime = 47; // 服务器开服时间
|
||||
optional int32 xiuweiLevel = 48; // 主角修为等级
|
||||
repeated PracticeSkillInfo practiceSkillInfos = 49;//修行技能数据
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -539,7 +541,8 @@ import "CommonProto.proto";
|
|||
|
||||
message UpdateUserExpIndicaiton{
|
||||
optional int32 level = 1 ;// 玩家等级
|
||||
optional int64 exp =2 ; // 玩家经验
|
||||
optional int64 exp = 2 ; // 玩家经验
|
||||
optional Drop drop = 3; // 玩家升级给的道具
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -677,6 +680,7 @@ import "CommonProto.proto";
|
|||
repeated SpecialEffects SpecialEffects = 3;//属性信息
|
||||
optional int32 force = 4 ; //战力
|
||||
optional int32 guildSkill = 5;//公会技能
|
||||
optional int32 treeLevel = 6;//神树等级
|
||||
}
|
||||
message RankRequest{
|
||||
optional int32 type = 1;//排行榜类型
|
||||
|
|
@ -715,6 +719,7 @@ import "CommonProto.proto";
|
|||
optional double amount = 1;//总储值
|
||||
optional double monthSaveAmt = 2 ; //月卡累计总额
|
||||
optional double smonthSaveAmt = 3 ; //豪华月卡累计总额
|
||||
optional double sincereMonth = 4 ; //挚礼月卡累计总额
|
||||
}
|
||||
|
||||
message VipTakeDilyRequest{
|
||||
|
|
@ -915,6 +920,7 @@ import "CommonProto.proto";
|
|||
}
|
||||
message HardStageResponse{
|
||||
optional HardStageInfo info = 1;
|
||||
optional bool isTake = 2; // 是否领取每日奖励 false :未领取
|
||||
}
|
||||
//请求山河社稷图战斗
|
||||
message HardStageFightRequest{
|
||||
|
|
@ -942,6 +948,10 @@ import "CommonProto.proto";
|
|||
message HardStageReportResponse{
|
||||
repeated HardStagePlayerInfo player = 1;
|
||||
}
|
||||
// 山河社稷图 每日领取奖励
|
||||
message HardStageDailyRewardResponse{
|
||||
optional Drop drop = 1;
|
||||
}
|
||||
//特权等级奖励状态
|
||||
message VipLevelStateRequset{
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue