Merge branch 'master_luofu' into master_xiyou

master_haizei01_luofu
grimm 2024-04-26 19:22:53 +08:00
commit 67358ac4ab
3 changed files with 43 additions and 29 deletions

View File

@ -353,7 +353,6 @@ option optimize_for = SPEED;
required int32 missionId = 1; //ID required int32 missionId = 1; //ID
required int32 progress = 2; // required int32 progress = 2; //
required int32 state = 3; //01 -1 required int32 state = 3; //01 -1
} }
required int32 activityId = 1; // id required int32 activityId = 1; // id
repeated MissionInfo mission = 2; // repeated MissionInfo mission = 2; //
@ -398,7 +397,7 @@ option optimize_for = SPEED;
optional ArenaPersonInfo personInfo =1; optional ArenaPersonInfo personInfo =1;
optional Team team = 2; // optional Team team = 2; //
optional int32 worshipTime = 3;// optional int32 worshipTime = 3;//
optional bool hadProud= 4;// optional bool hadProud = 4;//
} }
message ArenaInfo{ message ArenaInfo{

View File

@ -1714,6 +1714,17 @@ enum MessageType{
QueryBookImageRequest = 7000006; QueryBookImageRequest = 7000006;
QueryBookImageResponse = 7000007; QueryBookImageResponse = 7000007;
QueryBookImageIndication = 7000008; QueryBookImageIndication = 7000008;
//
LuofuRegisterRequest = 7000009;
LuofuRegisterResponse = 70000010;
LuofuStatusInfoRequest = 7000011;
LuofuStatusInfoResponse = 7000012;
//
CrossServerStatusRequest = 7000013;
CrossServerStatusResponse = 7000014;
} }

View File

@ -2,43 +2,33 @@ package rpc.world;
option optimize_for = SPEED; option optimize_for = SPEED;
// request response // request response
import "CommonProto.proto"; import "CommonProto.proto";
message GetWorldArenaInfoRequest{ message GetWorldArenaInfoRequest{
optional bool isPro = 1;// optional int32 type = 1;//
} }
message GetWorldArenaInfoResponse{ message GetWorldArenaInfoResponse{
optional rpc.protocols.ArenaInfo arenaInfo = 1; optional rpc.protocols.ArenaInfo arenaInfo = 1;
optional int32 stage = 2;//1 2 3 optional int32 stage = 2;//1 2
optional int32 endTime = 3;// optional int32 endTime = 3;//
optional int32 enterable = 4;//
optional int32 isGroup = 5;// 1 0
optional int32 isStart = 6;//30 1
} }
message GetWorldArenaInfoIndication{ message GetWorldArenaInfoIndication{
optional rpc.protocols.ArenaInfo arenaInfo = 1; optional rpc.protocols.ArenaInfo arenaInfo = 1;
optional int32 stage = 2;//1 2 3 optional int32 endTime = 2;//
optional int32 endTime = 3;//
} }
// //
// //
message GetWorldArenaChallengeRequest{ message GetWorldArenaChallengeRequest{
optional int32 teamId =1; // id optional int32 teamId =1; // id
optional int32 challengeServerid = 2 ;// le Serverid optional int32 challengeUid = 2;// uid
optional int32 challengeUid = 3 ;// uid optional int32 challengeRank = 3;//
optional int32 challengeRank = 4 ;// optional int32 skipFight = 4;// 1 0:
optional int32 skipFight = 5 ;// 1 0: optional int32 myCurrentRank = 5;//
optional rpc.protocols.ArenaEnemy arenaEnemys = 6; //gsview
optional rpc.protocols.FightTeamInfo fightTeamInfo = 7;//gs
optional int32 totalForce =8;//gs
optional int32 myCurrentRank = 9;//
} }
message GetWorldArenaChallengeResponse{ message GetWorldArenaChallengeResponse{
optional rpc.protocols.ArenaInfo arenaInfo = 1;// optional rpc.protocols.ArenaInfo arenaInfo = 1;//
@ -51,15 +41,13 @@ import "CommonProto.proto";
// //
message GetWorldArenaProudRequest{ message GetWorldArenaProudRequest{
optional int32 challengeUid = 1 ;// uid optional int32 challengeUid = 1 ;// uid
optional int32 challengeRank = 2 ;//
} }
message GetWorldArenaProudResponse{ message GetWorldArenaProudResponse{
optional rpc.protocols.Drop drop = 1;// optional rpc.protocols.Drop drop = 1;//
optional int32 worshipTime = 2;// optional int32 worshipTime = 2;//
optional int32 err = 3 ; //0 -1
} }
// //
message WroldBattleRecord { message WroldBattleRecord {
optional string recordId = 1; optional string recordId = 1;
optional rpc.protocols.ArenaEnemy redEnemy = 2; // optional rpc.protocols.ArenaEnemy redEnemy = 2; //
@ -69,18 +57,27 @@ import "CommonProto.proto";
optional int32 oldrank = 6;// optional int32 oldrank = 6;//
optional int32 rank = 7;// optional int32 rank = 7;//
optional int32 attackTime =8 ; // optional int32 attackTime =8 ; //
} }
message GetWorldArenaRecordInfoRequest{ message GetWorldArenaRecordInfoRequest{
} }
message GetWorldArenaRecordInfoResponse{ message GetWorldArenaRecordInfoResponse{
repeated WroldBattleRecord wroldBattleRecord =1; repeated WroldBattleRecord wroldBattleRecord =1;
} }
//
message LuofuRegisterRequest{
optional int32 type = 1;//
}
//
message LuofuStatusInfoRequest{
}
message LuofuStatusInfoResponse{
optional int32 type = 1;//,0
optional int32 status = 2;// 1 2 3 4
}
//gs --word //gs --word
message GetGSUserArenaInfoRequest{ message GetGSUserArenaInfoRequest{
@ -199,7 +196,14 @@ import "CommonProto.proto";
optional string fightId = 1; optional string fightId = 1;
} }
message ReplayWorldArenaResponse{ message ReplayWorldArenaResponse{
optional rpc.protocols.FightData fightData =1;// optional rpc.protocols.FightData fightData =1;//
}
//
message CrossServerStatusRequest{
}
message CrossServerStatusResponse{
optional int32 crossId = 1;//-1id
} }