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
commit 3329b730d6
17 changed files with 283 additions and 17 deletions

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

View File

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

View File

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

View File

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

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;//
}
@ -866,4 +870,5 @@ option optimize_for = SPEED;
optional int32 overTime = 2;
}

View File

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

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{

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
package com.ljsd.jieling.protocols;
package rpc.protocols;
option optimize_for = SPEED;
@ -957,8 +957,6 @@ enum MessageType{
WORKSHOP_TECHNOLOGY_RESET_REQUEST = 12212; //
WORKSHOP_TECHNOLOGY_RESET_RESPONSE = 12213;
@ -1099,6 +1097,9 @@ enum MessageType{
SeletSubRewardPoolRequest = 303671;//
SeletSubRewardPoolResponse = 303672;
WorldLevelIndication= 303673;//
//303691 - 303692
NewGeneralAttackRequest = 303691;
NewGeneralAttackResponse = 303692;
@ -1106,6 +1107,48 @@ enum MessageType{
// 303701 - 303702
UpgradeGodTreeRequest = 303701;
UpgradeGodTreeResponse = 303702;
//800000global
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;
}

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{
@ -761,6 +764,14 @@ import "CommonProto.proto";
optional int32 weekTime = 2;
}
message WorldLevelIndication{
optional int32 worldLeve = 1;//
}

View File

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

View File

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

View File

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

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
}

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; //gsview
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;
}