root
/
miduo_protocol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_protocol into master_test_hw

master_huanxiang
duhui 2020-12-17 10:01:06 +08:00
parent 7632c96830 1522ebc97b
commit 3329b730d6
17 changed files with 283 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build-lua.bat
View File

@ -14,4 +14,14 @@ for /r %%i in (*.proto)do (
%protocExe% --proto_path=%_protoSrc% --plugin=protoc-gen-lua=%protocGenLua% --lua_out=%protoluaOut% %%i
echo %protoluaOut%\%%~ni.lua--ok!
)
cd gtGprotos
for /r %%i in (*.proto)do (
%protocExe% --proto_path=%_protoSrc% --plugin=protoc-gen-lua=%protocGenLua% --lua_out=%protoluaOut% %%i
echo %protoluaOut%\%%~ni.lua--ok!
)
pause

2
protos/ActivityProto.proto
View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;

2
protos/ArenaInfoProto.proto
View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;

2
protos/ChatProto.proto
View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;

9
protos/CommonProto.proto
View File

@ -1,5 +1,5 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;
@ -304,6 +304,7 @@ option optimize_for = SPEED;
optional int32 rank =6; //排名
optional int32 totalForce =7;
optional int32 headFrame = 8;
optional string servername = 9;//服务器名称
}
@ -314,13 +315,15 @@ option optimize_for = SPEED;
message ArenaEnemy{
optional ArenaPersonInfo personInfo =1;
optional Team team =2; //队伍展示信息
optional int32 worshipTime = 3;//膜拜次数
optional bool hadProud= 4;//我是否膜拜
}
message ArenaInfo{
optional int32 failNums =1;
optional int32 successNums =2;
optional int32 score = 3;
optional int32 score = 3;//跨服排名 -1
repeated ArenaEnemy arenaEnemys = 4; //对手信息
repeated int32 hadTakeBox = 5;
}
@ -456,6 +459,7 @@ option optimize_for = SPEED;
optional int32 force = 8;//战力
optional int32 guildSign = 9 ;//公会图腾
optional int32 sex = 10;//性别
optional string serverName = 11;//所在区服
}
@ -867,3 +871,4 @@ option optimize_for = SPEED;
}

2
protos/Expedition.proto
View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;

3
protos/Family.proto
View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;
@ -431,6 +431,7 @@ import "CommonProto.proto";
optional int32 pathId = 1;
optional string guildName = 2;
optional int32 gid = 3;
optional string serverName = 4;
}
message GetDeathPathStatusResponse{

2
protos/FightInfoProto.proto
View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;

2
protos/HeroInfoProto.proto
View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;

2
protos/MapInfoProto.proto
View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;

49
protos/MessageTypeProto.proto
View File

@ -1,5 +1,5 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;
@ -960,8 +960,6 @@ enum MessageType{
// X 12300
// Y 12400
// Z 12500
@ -1099,6 +1097,9 @@ enum MessageType{
SeletSubRewardPoolRequest = 303671;//易经宝库
SeletSubRewardPoolResponse = 303672;
WorldLevelIndication= 303673;//世界等级推送
//303691 - 303692 新将来袭
NewGeneralAttackRequest = 303691;
NewGeneralAttackResponse = 303692;
@ -1107,6 +1108,48 @@ enum MessageType{
UpgradeGodTreeRequest = 303701;
UpgradeGodTreeResponse = 303702;
//800000起为global 协议
GetWorldServerRequest = 800001;//获取世界服ip
GetWorldServerResponse = 800002;
//900000起为跨服消息 世界服服返回消息gs只负责透传
GetWorldArenaInfoRequest = 900001;
GetWorldArenaInfoResponse = 900002;
//跨服天梯挑战
GetWorldArenaChallengeRequest = 900003;
GetWorldArenaChallengeResponse = 900004;
//膜拜
GetWorldArenaProudRequest= 900005;
GetWorldArenaProudResponse = 900006;
//跨服天梯挑战与被挑战 战斗记录
GetWorldArenaRecordInfoRequest= 900007;
GetWorldArenaRecordInfoResponse= 900008;
//gs --》word
GetGSUserArenaInfoRequest = 900009;
GetGSUserArenaInfoResponse = 900010;
GetRankRequest = 900011;
AddDeathPathRankRequest = 900012;
GetDeathPathFirstRequest = 900013;
GetDeathPathRewardRequest = 900014;
DeathPathWorldRewardRequest = 900015;
ViewHeroInfoRequest = 9000015;
ViewHeroInfoResponse = 900016;
GetPlayerOneTeamInfoRequest = 900017;
GetPlayerOneTeamInfoResponse= 900018;
}

13
protos/PlayerInfoProto.proto
View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;
@ -71,6 +71,7 @@ import "CommonProto.proto";
optional int32 expeditionLeve =31 ; //猎妖之路阶段 -1 待选择
optional int32 hadLuckTime = 32;//幸运探宝次数
optional int32 hadAdvanceLuckTime = 33;//高级幸运探宝次数
optional int32 worldLeve = 34;//世界等级
}
@ -496,6 +497,7 @@ import "CommonProto.proto";
message GetPlayerOneTeamInfoRequest{
optional int32 playerId = 1;
optional int32 teamId = 2;
optional int32 serverId = 3;
}
message GetPlayerOneTeamInfoResponse{
optional TeamOneInfo teamInfo = 1;
@ -640,6 +642,7 @@ import "CommonProto.proto";
message ViewHeroInfoRequest{
optional int32 targetUid = 1;
optional string heroId = 2 ;// 动态id
optional int32 serverId = 3;
}
message ViewHeroInfoResponse{
@ -762,5 +765,13 @@ import "CommonProto.proto";
}
message WorldLevelIndication{
optional int32 worldLeve = 1;//世界等级推送
}

2
protos/RoomFightProto.proto
View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;

2
protos/RoomProto.proto
View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;

2
protos/SceneFight.proto
View File

@ -1,4 +1,4 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;

23
protos/gtGprotos/GlobalProto.proto 100644
View File

@ -0,0 +1,23 @@
package rpc.global;
option optimize_for = SPEED;
// request 编号需要小于 response 编号
message GetWorldServerRequest{
optional int32 serverID = 1;
}
message GetWorldServerResponse{
optional string ip = 1;
optional string port = 2;
optional int32 group =3;//分组 全服唯一worldId*10000+index；
}

173
protos/gtwprotos/WorldProto.proto 100644
View File

@ -0,0 +1,173 @@
package rpc.world;
option optimize_for = SPEED;
// request 编号需要小于 response 编号
import "CommonProto.proto";
message GetWorldArenaInfoRequest{
optional bool isPro = 1;//是否膜拜阶段
}
message GetWorldArenaInfoResponse{
optional rpc.protocols.ArenaInfo arenaInfo = 1;
optional int32 stage = 2;//1 未开始 2 战斗阶段 3 膜拜阶段
optional int32 endTime = 3;//阶段结束时间戳
optional int32 enterable = 4;//是否可以参加
}
message GetWorldArenaInfoIndication{
optional rpc.protocols.ArenaInfo arenaInfo = 1;
optional int32 stage = 2;//1 未开始 2 战斗阶段 3 膜拜阶段
optional int32 endTime = 3;//阶段结束时间戳
}
// 需要的数据 世界等级（推送）
//跨服天梯挑战
message GetWorldArenaChallengeRequest{
optional int32 teamId =1; // 本人进攻队伍id
optional int32 challengeServerid = 2 ;// 废弃le 对手Serverid
optional int32 challengeUid = 3 ;// 对手uid
optional int32 challengeRank = 4 ;// 对手排名 过期校验
optional int32 skipFight = 5 ;// 1：标识跳过战斗 0: 不跳过战斗
optional rpc.protocols.ArenaEnemy arenaEnemys = 6; //gs携带的view信息
optional rpc.protocols.FightTeamInfo fightTeamInfo = 7;//gs携带的挑战数据
optional int32 totalForce =8;//gs携带的玩家实时战力
}
message GetWorldArenaChallengeResponse{
optional rpc.protocols.ArenaInfo arenaInfo = 1;//新的一批对手信息
optional rpc.protocols.FightData fightData =2; // 战斗数据
optional int32 fightResult = 3 ;// 战斗结果
optional rpc.protocols.Drop drop = 4 ;
optional int32 err = 5 ; //默认0 -1 时 表示挑战目标排名发生变化 需刷新
}
//膜拜
message GetWorldArenaProudRequest{
optional int32 challengeUid = 1 ;// 对手uid
optional int32 challengeRank = 2 ;// 对手排名 过期校验
}
message GetWorldArenaProudResponse{
optional rpc.protocols.Drop drop = 1;//膜拜奖励 （头像框奖励）
optional int32 worshipTime = 2;//膜拜次数
optional int32 err = 3 ; //默认0 -1 时 表示挑战目标排名发生变化 需刷新
}
//跨服天梯挑战与被挑战 战斗记录
message WroldBattleRecord {
optional string recordId = 1;
optional rpc.protocols.ArenaEnemy redEnemy = 2; //我的信息 或者攻击者信息
optional rpc.protocols.ArenaEnemy blueEnemy = 3; //对方信息
optional int32 result = 4;
optional rpc.protocols.FightData fightData =5;//战斗数据
optional int32 oldrank = 6;//战斗胜利之前排名
optional int32 rank = 7;//战斗胜利后排名
optional int32 attackTime =8 ; //进攻时间
}
message GetWorldArenaRecordInfoRequest{
}
message GetWorldArenaRecordInfoResponse{
repeated WroldBattleRecord wroldBattleRecord =1;
}
//gs --》word
message GetGSUserArenaInfoRequest{
optional int32 uid =1;
}
message GetGSUserArenaInfoResponse{
optional rpc.protocols.ArenaEnemy arenaEnemys = 1; //指定服玩家view信息
optional rpc.protocols.FightTeamInfo fightTeamInfo = 2; //指定服玩家fight信息
optional int32 totalForce =3;//指定服玩家实时战力
}
message GetRankRequest{
optional int32 type = 1;//种类id
optional int32 acitvityId = 2;//活动id
optional int32 crossId =3;//大区id
optional int32 uid = 4;//用户id
}
message GetRankResponse{
repeated rpc.protocols.UserRank ranks = 1;
optional rpc.protocols.RankInfo myRankInfo = 2;
}
message CrossUser{
optional int32 uid = 1;
optional string username = 2;
}
message AddDeathPathRankRequest{
optional int32 uid = 1;
optional CrossUser crossUserInfo = 2;
optional int32 guildId = 3;
optional int32 damage = 4;
optional int32 pathId = 5;
optional int32 groupId = 6;
}
message AddDeathPathRankResponse{
}
message EvertDeathPath{
optional int32 gid = 1;
optional string guildName = 2;
optional int32 pathId = 3;
optional string serverName =4;
}
message GetDeathPathFirstRequest{
optional int32 groupId = 1;
}
message GetDeathPathFirstResponse{
repeated EvertDeathPath deathPathInfo = 1;
}
message GetDeathPathRewardRequest{
optional int32 groupId =1;
optional int32 guildId = 2;
}
message GetDeathPathRewardResponse{
optional int32 rankTotal = 1;
}
message GuildRank{
optional int32 guildId = 1;
optional int32 rank = 2;
}
//服务器整个结算
message DeathPathWorldRewardRequest{
optional int32 groupId =1;
}
message DeathPathWorldRewardResponse{
repeated GuildRank ranks = 1;//所有需要发奖的公会id
}
message ViewHeroInfoRequest{
optional int32 targetUid = 1;
optional string heroId = 2 ;// 动态id
}
message ViewHeroInfoResponse{
optional rpc.protocols.Hero hero =1;
repeated rpc.protocols.Equip equip =2; // 英雄所穿装备、魂印（法宝不在内，放在Hero中）
repeated rpc.protocols.SpecialEffects SpecialEffects = 3;//属性信息
optional int32 force = 4 ; //战力
optional int32 guildSkill = 5;//公会技能
}
//获取编队信息
message GetPlayerOneTeamInfoRequest{
optional int32 playerId = 1;
optional int32 teamId = 2;
}
message GetPlayerOneTeamInfoResponse{
optional rpc.protocols.TeamOneInfo teamInfo = 1;
}