Merge branch 'master_test_gn' into master_test_gn_endless
commit
6eca63ddbc
|
@ -26,6 +26,7 @@ message ChatInfo{
|
|||
optional int32 speed = 20;
|
||||
optional int32 multiple = 21; //显示次数
|
||||
optional int32 userTitle = 22;
|
||||
optional int32 practiceLevel = 23;//修行等级
|
||||
}
|
||||
|
||||
message GetChatMessageInfoRequest {
|
||||
|
|
|
@ -15,7 +15,7 @@ option optimize_for = SPEED;
|
|||
optional int32 uid = 1;
|
||||
optional string nickName = 2;
|
||||
optional int32 level = 3;
|
||||
optional int32 exp = 4;
|
||||
optional int64 exp = 4;
|
||||
optional int32 vipLevel = 5;
|
||||
optional int32 familyId = 6;
|
||||
optional int32 head = 7;
|
||||
|
@ -106,6 +106,7 @@ option optimize_for = SPEED;
|
|||
optional int32 createtype = 15;//创建类型 1猎妖援助
|
||||
optional int32 changeId = 16;//置换模板id 默认0
|
||||
}
|
||||
|
||||
message PokemonInfo{
|
||||
optional int32 tempId = 1; //异妖id
|
||||
optional string id = 2;
|
||||
|
@ -120,7 +121,7 @@ option optimize_for = SPEED;
|
|||
optional int32 position = 4; // 位置
|
||||
optional int32 star = 5; // 星级
|
||||
optional int32 skinId = 6;//皮肤
|
||||
|
||||
optional string realId = 7;//唯一id
|
||||
}
|
||||
|
||||
|
||||
|
@ -240,6 +241,7 @@ option optimize_for = SPEED;
|
|||
optional int32 fightMaxTime =4; //战斗最长时间
|
||||
optional int32 fightType = 5 ; // 战斗类型
|
||||
optional string fightId = 6; //战斗id唯一,玩家id#服务器id#战斗类型id#时间戳
|
||||
optional int32 nodeId = 7;//节点id(山河社稷图)
|
||||
}
|
||||
|
||||
message ExploreDetail{
|
||||
|
@ -312,6 +314,7 @@ option optimize_for = SPEED;
|
|||
optional int32 userSkin = 11;
|
||||
optional int32 userTitle = 12;
|
||||
optional int32 userMount = 13;
|
||||
optional int32 practiceLevel = 14;//修行等级
|
||||
}
|
||||
|
||||
|
||||
|
@ -424,6 +427,7 @@ option optimize_for = SPEED;
|
|||
optional int32 userTitle = 16;
|
||||
optional int32 userMount = 17;
|
||||
optional int32 sex = 18;
|
||||
optional int32 practiceLevel = 19;//修行等级
|
||||
}
|
||||
message GiftGoodsInfo{
|
||||
optional int32 goodsId =1;//商品id
|
||||
|
@ -478,6 +482,7 @@ option optimize_for = SPEED;
|
|||
optional int32 userSkin = 12;
|
||||
optional int32 userTitle = 13;
|
||||
optional int32 userMount = 14;
|
||||
optional int32 practiceLevel = 15;//修行等级
|
||||
}
|
||||
|
||||
|
||||
|
@ -631,6 +636,12 @@ option optimize_for = SPEED;
|
|||
optional int32 days = 1; //签到的天数
|
||||
optional int32 state = 2;//今日是否领取
|
||||
}
|
||||
|
||||
message PurpleSealShowInfo{
|
||||
optional int32 id = 1;
|
||||
optional int32 type = 2;
|
||||
optional int32 heroTId = 3;
|
||||
}
|
||||
|
||||
message TeamSimpleInfo{
|
||||
optional string heroid = 1;
|
||||
|
@ -646,6 +657,7 @@ option optimize_for = SPEED;
|
|||
repeated TeamSimpleInfo PokemonInfos = 2;
|
||||
optional int32 totalForce=3;
|
||||
repeated int64 remainHp = 4;//剩余血量百分比
|
||||
repeated PurpleSealShowInfo sealShow = 5;//紫府神印
|
||||
}
|
||||
//第一编队信息
|
||||
message TeamOneInfo{
|
||||
|
@ -658,6 +670,7 @@ option optimize_for = SPEED;
|
|||
optional TeamOneTeamInfo team = 6;
|
||||
optional int32 isApplyed = 8;//是否已经申请过
|
||||
optional int32 userTitle = 9;
|
||||
optional int32 practiceLevel = 10;//修行等级
|
||||
}
|
||||
|
||||
//妖兽排行
|
||||
|
@ -915,5 +928,60 @@ option optimize_for = SPEED;
|
|||
optional int32 mountId = 1;
|
||||
optional int32 overTime = 2;
|
||||
}
|
||||
|
||||
//玩家福利红包
|
||||
message WelfareRedPacket{
|
||||
optional int32 id = 1;
|
||||
optional int32 num = 2;
|
||||
}
|
||||
|
||||
|
||||
//山河社稷图战斗信息
|
||||
message HardStagePlayerInfo{
|
||||
optional int32 uid = 1;
|
||||
optional int32 level = 2;
|
||||
optional int32 head = 3;
|
||||
optional string userName = 4;
|
||||
optional int32 headFrame = 5;//头像框
|
||||
optional FightData fightData = 6;
|
||||
optional int32 power = 7;
|
||||
optional int32 type = 8;//1:首次通关记录 2:最低战力通关记录
|
||||
}
|
||||
//山河社稷图章节奖励信息
|
||||
message HardStageChapterReward{
|
||||
optional int32 id = 1;
|
||||
optional int32 state = 2;//0.未领取1.已领取
|
||||
}
|
||||
//山河社稷图节点信息
|
||||
message HardStageNode{
|
||||
optional int32 nodeId = 1;
|
||||
optional int32 type = 2; //类型:1.大节点2.奖励小节点3.挑战小节点
|
||||
optional int32 state = 3; //状态:0-7星级状态,8为荣耀三星,0为小节点未通过1为小节点通过
|
||||
optional bool isFirst= 4; //是否是第一次荣耀
|
||||
optional bool isPass= 5; //节点是否通过
|
||||
}
|
||||
//山河社稷图章节信息
|
||||
message HardStageChapter{
|
||||
optional int32 chapterId = 1;
|
||||
repeated HardStageNode node = 2;
|
||||
optional int32 stars = 3;
|
||||
repeated HardStageChapterReward reward = 4;
|
||||
}
|
||||
//山河社稷图信息
|
||||
message HardStageInfo{
|
||||
repeated HardStageChapter chapter = 1;
|
||||
}
|
||||
|
||||
|
||||
// 紫府神印
|
||||
message PurpleMansionSeal{
|
||||
optional int32 id = 1;//神印id
|
||||
optional int32 type = 2;//神印类型
|
||||
optional string subId = 3;//神印附属英雄id
|
||||
optional int32 state = 4;//神印状态 0:未使用,1:已使用
|
||||
}
|
||||
|
||||
//通用键值对
|
||||
message KeyVal{
|
||||
optional int32 key = 1;
|
||||
optional int32 val = 2;
|
||||
}
|
||||
|
|
|
@ -28,6 +28,7 @@ import "CommonProto.proto";
|
|||
optional int32 userTitle = 21;
|
||||
optional int32 userMount = 22;
|
||||
optional int32 sex = 23;
|
||||
optional int32 practiceLevel = 24;//修行等级
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -356,4 +356,34 @@ import "CommonProto.proto";
|
|||
// 鸿蒙碑新手引导推送
|
||||
message HongmengSteleNewHandIndication{
|
||||
optional int32 state = 1;// 开启鸿蒙碑
|
||||
}
|
||||
}
|
||||
|
||||
// 修行玩法 升级
|
||||
message UpPracticeLevelRequest{}
|
||||
|
||||
message UpPracticeLevelResponse{
|
||||
optional int32 practiceLevel = 1;//等级
|
||||
}
|
||||
|
||||
|
||||
// 修行玩法 替换紫府神印
|
||||
// 三种类型
|
||||
// 1: oldSealId != newSealId : 替换神印
|
||||
// 2: oldSealId == newSealId && newSealId.subId == subId : 卸载神印
|
||||
// 3: oldSealId == newSealId && newSealId.subId != subId : 替换神印英雄
|
||||
message ReplacePurpleMansionSealRequest{
|
||||
optional int32 oldSealId = 1;//旧神印id
|
||||
optional int32 newSealId = 2;//新神印id
|
||||
optional string subId = 3;//附属英雄id
|
||||
}
|
||||
|
||||
message ReplacePrupleMansionSealResponse{
|
||||
repeated PurpleMansionSeal sealList = 1;
|
||||
};
|
||||
|
||||
// 推送神印信息
|
||||
message PurpleMansionSealIndication{
|
||||
repeated PurpleMansionSeal sealList = 1;
|
||||
}
|
||||
|
||||
|
|
@ -81,6 +81,10 @@ enum MessageType{
|
|||
ADVENTURE_CALL_BOSS_REQUEST = 10054; // 召唤秘境boss
|
||||
ADVENTURE_CALL_BOSS_RESPONSE = 10055;
|
||||
|
||||
WELFARE_RED_PACKET_INFO = 10056;//福利红包信息
|
||||
WELFARE_RED_PACKET_SEND_REQUEST = 10057;//福利红包发送
|
||||
WELFARE_RED_PACKET_SEND_RESPONSE = 10058;
|
||||
|
||||
// B 10100
|
||||
BUY_STORE_ITEM_REQUEST = 10100; // 购买商店物品
|
||||
BUY_STORE_ITEM_RESPONSE = 10101;
|
||||
|
@ -1009,6 +1013,25 @@ enum MessageType{
|
|||
WORKSHOP_TECHNOLOGY_RESET_REQUEST = 12212; //科技树重置
|
||||
WORKSHOP_TECHNOLOGY_RESET_RESPONSE = 12213;
|
||||
|
||||
HARD_STAGE_FIGHT_START_REQUEST = 12214;//山河社稷图战斗
|
||||
HARD_STAGE_FIGHT_START_RESPONSE = 12215;
|
||||
|
||||
HARD_STAGE_INFO_REQUEST = 12216;//山河社稷图请求信息
|
||||
HARD_STAGE_INFO_RESPONSE = 12217;
|
||||
|
||||
HARD_STAGE_CHAPTER_REWARD_REQUEST = 12218;//山河社稷图章节奖励
|
||||
HARD_STAGE_CHAPTER_REWARD_RESPONSE = 12219;
|
||||
|
||||
HARD_STAGE_REPORT_REQUEST = 12220;//山河社稷图回放
|
||||
HARD_STAGE_REPORT_RESPONSE = 12221;
|
||||
|
||||
VIP_LEVEL_STATE_REQUEST = 12222;//特权等级奖励状态
|
||||
VIP_LEVEL_STATE_RESPONSE = 12223;
|
||||
|
||||
VIP_LEVEL_STATE_REWARD_REQUEST = 12224;//特权等级奖励领取
|
||||
VIP_LEVEL_STATE_REWARD_RESPONSE = 12225;
|
||||
|
||||
|
||||
|
||||
|
||||
// X 12300
|
||||
|
@ -1185,6 +1208,17 @@ enum MessageType{
|
|||
ActiveUserMountRequest = 303907;
|
||||
ActiveUserMountResponse = 303908;
|
||||
|
||||
|
||||
// 修行玩法 升级
|
||||
UpPracticeLevelRequest = 304101;
|
||||
UpPracticeLevelResponse = 304102;
|
||||
|
||||
// 修行玩法 替换紫府神印
|
||||
ReplacePurpleMansionSealRequest = 304103;
|
||||
ReplacePurpleMansionSealResponse = 304104;
|
||||
|
||||
PurpleMansionSealIndication = 304105;
|
||||
|
||||
//800000起为global 协议
|
||||
GetWorldServerRequest = 800001;//获取世界服ip
|
||||
GetWorldServerResponse = 800002;
|
||||
|
|
|
@ -77,6 +77,9 @@ import "CommonProto.proto";
|
|||
repeated UserSkinInfo userSkinList = 37;//玩家皮肤信息
|
||||
repeated UserTitleInfo userTitleList = 38;//玩家称号信息
|
||||
repeated UserMountInfo userMountList = 39;//玩家坐骑信息
|
||||
optional int32 dailyredpack = 40;//每日福利红包领取次数
|
||||
optional int32 practiceLevel = 41;//修行等级
|
||||
repeated PurpleMansionSeal sealList = 42;//神印列表
|
||||
}
|
||||
|
||||
|
||||
|
@ -529,7 +532,7 @@ import "CommonProto.proto";
|
|||
|
||||
message UpdateUserExpIndicaiton{
|
||||
optional int32 level = 1 ;// 玩家等级
|
||||
optional int32 exp =2 ; // 玩家经验
|
||||
optional int64 exp =2 ; // 玩家经验
|
||||
}
|
||||
|
||||
|
||||
|
@ -837,4 +840,59 @@ import "CommonProto.proto";
|
|||
//推送礼包推送
|
||||
message PushWelfareResponse{
|
||||
repeated int32 id = 1;
|
||||
}
|
||||
}
|
||||
//福利红包推送
|
||||
message WelfareRedPacketPush{
|
||||
repeated WelfareRedPacket redpacket = 1;
|
||||
}
|
||||
//福利红包发送
|
||||
message WelfareRedPacketSendRequest{
|
||||
optional int32 id = 1;
|
||||
}
|
||||
message WelfareRedPacketSendResponse{
|
||||
repeated WelfareRedPacket redpacket = 1;
|
||||
}
|
||||
//请求山河社稷图数据
|
||||
message HardStageRequest{
|
||||
}
|
||||
message HardStageResponse{
|
||||
optional HardStageInfo info = 1;
|
||||
}
|
||||
//请求山河社稷图战斗
|
||||
message HardStageFightRequest{
|
||||
optional int32 nodeId = 1;
|
||||
optional int32 teamId = 2;
|
||||
}
|
||||
message HardStageFightResponse{
|
||||
optional FightData fightData = 1;
|
||||
optional Drop drop = 2;
|
||||
optional int32 stars = 3; //状态:0-7星级状态,8为荣耀三星
|
||||
}
|
||||
//山河社稷图领取奖励
|
||||
message GetHardStageChapterReward{
|
||||
optional int32 chapterId = 1;
|
||||
optional int32 rewradId = 2;
|
||||
}
|
||||
message GetHardStageChapterRewardResponse{
|
||||
optional Drop drop = 1;
|
||||
}
|
||||
//请求山河社稷图战斗回访
|
||||
message HardStageReportRequset{
|
||||
optional int32 hardStageId = 1;
|
||||
}
|
||||
message HardStageReportResponse{
|
||||
repeated HardStagePlayerInfo player = 1;
|
||||
}
|
||||
//特权等级奖励状态
|
||||
message VipLevelStateRequset{
|
||||
}
|
||||
message VipLevelStateResponse{
|
||||
repeated KeyVal vipState = 1;//键值对<id,领取状态(0,未领取,1已领取)>
|
||||
}
|
||||
//特权等级奖励领取
|
||||
message VipLevelStateRewardRequset{
|
||||
optional int32 vipLevelId = 1;
|
||||
}
|
||||
message VipLevelStateRewardResponse{
|
||||
optional Drop drop = 1;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue