Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts: # protos/CommonProto.proto # protos/MessageTypeProto.protomaster_huanxiang
commit
e0e2793e8b
|
|
@ -16,7 +16,7 @@ option optimize_for = SPEED;
|
|||
optional int32 level = 3;
|
||||
optional int32 exp = 4;
|
||||
optional int32 vipLevel = 5;
|
||||
optional string familyId = 6;
|
||||
optional int32 familyId = 6;
|
||||
optional string head = 7;
|
||||
optional int32 curMapId = 8;
|
||||
|
||||
|
|
@ -487,8 +487,11 @@ option optimize_for = SPEED;
|
|||
optional string name = 2 ; // 公会名称
|
||||
optional string annouce =3 ; // 公会宣言
|
||||
optional int32 levle = 4 ; //等级
|
||||
optional int32 totalNum =5; //总共人数
|
||||
optional int32 maxNum = 6 ;// 最大人数
|
||||
optional int32 exp = 5; //公会经验
|
||||
optional int32 totalNum =6; //总共人数
|
||||
optional int32 maxNum = 7 ;// 最大人数
|
||||
optional int32 joinType = 8; //加入类型 1:直接加入 2:申请加入 3:禁止加入
|
||||
optional int32 icon = 9; // 公会图标
|
||||
}
|
||||
|
||||
//无尽副本英雄信息
|
||||
|
|
@ -505,3 +508,10 @@ option optimize_for = SPEED;
|
|||
optional int32 rank =4;
|
||||
}
|
||||
|
||||
//无尽副本标志信息
|
||||
message endlessSign{
|
||||
optional int32 mapId = 1;
|
||||
optional int32 cellId = 2;
|
||||
optional string info = 3;
|
||||
optional int32 type = 4;//1为设置标记、2为删除标记
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,31 +4,112 @@ option optimize_for = SPEED;
|
|||
|
||||
import "CommonProto.proto";
|
||||
|
||||
|
||||
message FamilyCreateReqeust{
|
||||
optional string name = 1 ; //公会名称
|
||||
optional string announce =2 ; // 公会宣言
|
||||
}
|
||||
message FamilyUserInfo{
|
||||
required int32 roleUid = 1; //玩家ID
|
||||
required string userName = 2; //玩家名称
|
||||
required int32 userLevel = 3; //玩家等级
|
||||
required int32 position = 4; //公会职位 0:无 1:会长 2:副会长 3:长老 4:精英 5:会员
|
||||
required int32 contribute = 5; //贡献
|
||||
optional int32 seconds = 6; //距离上一次登陆时间, 0在线 , > 0 距离上次登录时间 秒
|
||||
optional int32 contributeToday = 7;//今日贡献
|
||||
optional int32 soulForce = 8; // 战斗力
|
||||
optional string head = 9; // 新头像
|
||||
optional int32 frame = 10; // 头像框
|
||||
}
|
||||
|
||||
|
||||
message FamilySearchReqeust{
|
||||
optional string name = 1 ;// 要搜素的公会名称
|
||||
}
|
||||
message FamilyLogInfo{
|
||||
required string name = 1; //玩家名称
|
||||
required string info = 2; //log内容
|
||||
required int32 time = 3; //记录时间
|
||||
}
|
||||
|
||||
message FamilySeachResponse{
|
||||
repeated FamilyBaseInfo familyBaseInfo =1;
|
||||
}
|
||||
|
||||
message FamilyApplyRequest{
|
||||
repeated int32 familyId = 1; //申请family
|
||||
}
|
||||
|
||||
//申请成功 推送成功加入公会信息
|
||||
message FamilyJoinIndicaion{
|
||||
repeated FamilyBaseInfo familyBaseInfo =1;
|
||||
}
|
||||
message FamilyApply{
|
||||
required string name = 1; // 玩家名称
|
||||
required int32 roleUid = 2; // 申请人ID
|
||||
required int32 time = 3; // 申请时间
|
||||
required int32 frame = 4; //头像框
|
||||
required int32 outTime = 5; // 离线时间长(秒) 0表示在线
|
||||
required int32 level = 6;
|
||||
required int32 foreces = 7; // 灵魂力
|
||||
}
|
||||
|
||||
|
||||
message FamilyRecommandResponse{
|
||||
repeated FamilyBaseInfo familyBaseInfo =1;
|
||||
}
|
||||
message FamilyNoticeInfo {
|
||||
required string guildNotice = 1;// 公会公告
|
||||
required int32 updateTime = 2; // 修改公告时间
|
||||
repeated int32 steps = 3; // 踩公告的玩家
|
||||
repeated int32 adminres = 4; // 赞公告的玩家
|
||||
required int32 hasNew = 5; // 1:有新字
|
||||
}
|
||||
|
||||
message FamilyRecomandInfo{
|
||||
optional FamilyBaseInfo familyBaseInfo =1;
|
||||
optional int32 isApply = 2 ;//是否申请过 0:未申请 1:已申请
|
||||
}
|
||||
|
||||
message GetFamilyInfoResponse{
|
||||
optional FamilyBaseInfo familyBaseInfo =1; // 公会信息
|
||||
optional FamilyUserInfo familyUserInfo =2; // 个人信息
|
||||
}
|
||||
|
||||
|
||||
message FamilyCreateReqeust{
|
||||
optional string name = 1 ; //公会名称
|
||||
optional string announce =2 ; // 公会宣言
|
||||
}
|
||||
|
||||
message FamilyCreateResponse{
|
||||
optional FamilyBaseInfo familyBaseInfo =1; // 公会信息
|
||||
optional FamilyUserInfo familyUserInfo =2; // 个人信息
|
||||
}
|
||||
|
||||
|
||||
message FamilySearchReqeust{
|
||||
optional string name = 1 ;// 要搜素的公会名称
|
||||
}
|
||||
|
||||
message FamilySeachResponse{
|
||||
repeated FamilyRecomandInfo familyRecomandInfo =1;
|
||||
}
|
||||
|
||||
message FamilyApplyRequest{
|
||||
repeated int32 familyId = 1; //申请family
|
||||
}
|
||||
|
||||
|
||||
//申请成功 推送成功加入公会信息
|
||||
message FamilyJoinIndicaion{
|
||||
optional FamilyBaseInfo familyBaseInfo =1;
|
||||
optional FamilyUserInfo familyUserInfo =2; // 个人信息
|
||||
}
|
||||
|
||||
message FamilyJoinRequest{
|
||||
optional int32 familyId = 1 ;// 要进入公会的id
|
||||
}
|
||||
|
||||
message FamilyJoinResponse{
|
||||
optional FamilyJoinIndicaion familyJoinIndicaion =1;
|
||||
}
|
||||
|
||||
|
||||
message FamilyRecommandResponse{
|
||||
repeated FamilyRecomandInfo familyRecomandInfo =1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//获取公会成员信息
|
||||
message GetFamilyMemberInfoResponse{
|
||||
repeated FamilyUserInfo familyUserInfo =1 ;
|
||||
}
|
||||
|
||||
//获取公会日志信息
|
||||
message GetFamilyLogResponse{
|
||||
repeated FamilyLogInfo familyLogInfo =1;
|
||||
}
|
||||
|
||||
//获取公会申请信息
|
||||
message GetFamilyApplyResponse{
|
||||
repeated FamilyApply familyApply =1;
|
||||
}
|
||||
|
|
@ -54,6 +54,8 @@ import "CommonProto.proto";
|
|||
repeated ExploreDetail exploreDetail = 11;
|
||||
// 补给点信息
|
||||
repeated TowerBuff buf = 12;
|
||||
// 无尽副本标志信息
|
||||
repeated endlessSign signs = 13;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -262,3 +264,11 @@ import "CommonProto.proto";
|
|||
repeated endlessHero heroInfo =1;
|
||||
}
|
||||
|
||||
//无尽副本标志
|
||||
message SignEndlessCellRequest{
|
||||
optional endlessSign sign = 1;
|
||||
}
|
||||
message SignEndlessCellResponse{
|
||||
optional string error = 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -130,6 +130,13 @@ enum MessageType{
|
|||
|
||||
ENDLESS_MAP_HERO_INFO_REQUEST = 10410;//无尽副本英雄信息
|
||||
ENDLESS_MAP_HERO_INFO_RESPONSE = 10411;
|
||||
|
||||
ENDLESS_MAP_RESET_REQUEST = 10412;//无尽副本重置
|
||||
ENDLESS_MAP_RESET_RESPONSE = 10413;
|
||||
|
||||
ENDLESS_MAP_SIGN_REQUEST = 10414;//无尽副本设置标记
|
||||
ENDLESS_MAP_SIGN_RESPONSE = 10415;
|
||||
|
||||
// F 10500
|
||||
FIGHT_START_REQUEST = 10500; //
|
||||
FIGHT_START_RESPONSE = 10501;
|
||||
|
|
@ -176,6 +183,19 @@ enum MessageType{
|
|||
|
||||
FAMILY_JOIN_INDICATION = 10529; //公会推送
|
||||
|
||||
FAMILY_GET_INFO_REQUEST = 10530 ; // 获取公会信息
|
||||
FAMILY_GET_INFO_RESPONSE = 10531;
|
||||
|
||||
FAMILY_GET_LOG_REQUEST = 10532 ; // 获取公会日志信息
|
||||
FAMILY_GET_LOG_RESPOSNE = 10533;
|
||||
|
||||
FAMILY_GET_MEMBER_REQUEST = 10534 ; // 获取公会成员信息
|
||||
FAMILY_GET_MEMBER_RESPOSNE = 10535;
|
||||
|
||||
FAMILY_GET_APPLY_REQUEST = 10536 ; // 获取申请列表信息
|
||||
FAMILY_GET_APPLY_RESPOSNE = 10537;
|
||||
|
||||
|
||||
|
||||
|
||||
// G 10600
|
||||
|
|
|
|||
Loading…
Reference in New Issue