Merge branch 'master_test_hw' into master_test_hongmeng

2021-01-07 13:44:47 +08:00 · 2021-01-07 13:44:47 +08:00 · 254dbd7800
parent 625bc10076 3c8f2c0d75
commit 254dbd7800
19 changed files with 389 additions and 75 deletions
--- a/build-java.bat
+++ b/build-java.bat
@ -1,20 +0,0 @@
-@echo off
-
-set protoExe=%cd%\tools\protoc-2.5.0-win32\protoc.exe
-set _protoSrc=C:\ljsd_msy\protocol_jieling\protos\
-
-set cdy=%cd%
-cd..
-set get=%cd%
-set protoOut=C:\ljsd_msy\jieling-server\serverlogic\src\main\java
-
-cd C:\ljsd_msy\protocol_jieling\protos
-
-for /r  %%i in (*.proto)do (
-echo %%i===============
-	%protoExe%  --proto_path=%_protoSrc%  --java_out=%protoOut%  %%i
-)
-pause 
-
-
-
--- a/build-java4(1).bat
+++ b/build-java4(1).bat
@ -0,0 +1,13 @@
+@echo off
+
+set protoExe=D:\jieling_protocol\tools\protoc-2.5.0-win32\protoc.exe
+set protoOutG=D:\jieling_num2\gamecommon\src\main\java
+
+cd D:\jieling_protocol\protos
+set cdy=%cd%
+for /r  %%i in (*.proto)do (
+echo %%i===============
+	%protoExe%  --proto_path=%cd%  --java_out=%protoOutG%  %%i
+)
+
+pause
--- a/build-lua.bat
+++ b/build-lua.bat
@ -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
--- a/protos/ActivityProto.proto
+++ b/protos/ActivityProto.proto
@ -1,4 +1,4 @@
-package com.ljsd.jieling.protocols;
+package rpc.protocols;

 option optimize_for = SPEED;

@ -34,4 +34,25 @@ import "CommonProto.proto";
 	message SpecicalMonsterChooseRequest{
 		optional int32 activityId = 1;
 		optional int32 selectId = 2;
+	}
+	
+	// 新将来袭
+	message NewGeneralAttackRequest{
+		// 活动id
+		optional int32 activityId = 1;
+		// 使用次数类型id
+		optional int32 privilageTypeId = 2;
+	}
+	
+	message NewGeneralAttackResponse{
+		// 战斗属性
+		optional FightData fightData = 1;
+		// 道具
+		optional Drop drop = 2;
+	}
+	
+	// 建木神树
+	message UpgradeGodTreeRequest{
+	}
+	message UpgradeGodTreeResponse{
 	}
--- a/protos/ArenaInfoProto.proto
+++ b/protos/ArenaInfoProto.proto
@ -1,4 +1,4 @@
-package com.ljsd.jieling.protocols;
+package rpc.protocols;

 option optimize_for = SPEED;

--- a/protos/ChatProto.proto
+++ b/protos/ChatProto.proto
@ -1,4 +1,4 @@
-package com.ljsd.jieling.protocols;
+package rpc.protocols;

 option optimize_for = SPEED;

@ -16,7 +16,8 @@ message ChatInfo{
    optional uint64 messageId = 11; // 消息号
    //跑马灯用
    optional int32 messageType = 13; // 消息类型 1:吉运,2:勤勉
-    optional int32 itemId =14; // 查看道具id
+    //optional int32 itemId =14; // 查看道具id
+	optional string itemId = 14; // 物品信息，用#分割
    optional int32 type = 15;  //0:系统 1:其他
    optional int32 startTime = 16 ; // 开始时间
    optional int32 endTime = 17;  //结束时间
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@ -1,5 +1,5 @@

-package com.ljsd.jieling.protocols;
+package rpc.protocols;

 option optimize_for = SPEED;

@ -40,6 +40,7 @@ option optimize_for = SPEED;
 		optional int32 ride = 22;//坐骑
 		optional int32 rideLevel = 23;//坐骑等级
 		optional int32 sex = 24;//玩家性别 0男1女
+		optional int32 treeLevel = 25;// 神树等级
 	}

 	 message Privilege{
@ -235,6 +236,7 @@ option optimize_for = SPEED;
 		optional int32 fightSeed = 3;	
 		optional int32 fightMaxTime =4; //战斗最长时间	
 		optional int32 fightType = 5 ; // 战斗类型
+		optional string fightId = 6; //战斗id唯一，玩家id#服务器id#战斗类型id#时间戳
 	}

 	message ExploreDetail{
@ -302,6 +304,8 @@ option optimize_for = SPEED;
 		optional int32 rank =6; //排名
 		optional int32 totalForce =7;
 		optional int32 headFrame = 8;
+		optional string servername = 9;//服务器名称
+		optional int32 gender = 10;//性别
 	}


@ -312,13 +316,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;
 	}
@ -385,6 +391,7 @@ option optimize_for = SPEED;
 		optional int32 type =4 ;// 任务类型 1：vip任务 2：每日任务 3:功绩 4： 孙龙的宝藏任务
 		optional int32 takeTimes = 5;//  领取次数
 		repeated string heroId = 6;//所派遣的英雄（迷宫寻宝专用）
+		optional int32 lock = 7;//任务上锁0：未上锁，1：已锁定（目前迷宫寻宝专用）
 	}

 	message VipBaseInfo{
@ -454,6 +461,7 @@ option optimize_for = SPEED;
 		optional int32 force = 8;//战力
 		optional int32 guildSign = 9 ;//公会图腾
 		optional int32 sex = 10;//性别
+		optional string serverName = 11;//所在区服
 	}
 	

@ -864,4 +872,5 @@ option optimize_for = SPEED;
 		optional int32 overTime = 2;
 	}
 	
+	
 	
--- a/protos/Expedition.proto
+++ b/protos/Expedition.proto
@ -1,4 +1,4 @@
-package com.ljsd.jieling.protocols;
+package rpc.protocols;

 option optimize_for = SPEED;

--- a/protos/Family.proto
+++ b/protos/Family.proto
@ -1,4 +1,4 @@
-package com.ljsd.jieling.protocols;
+package rpc.protocols;

 option optimize_for = SPEED;

@ -378,6 +378,12 @@ import "CommonProto.proto";
 	//公会技能升级
 	message GuildSkillLevelUpRequest{
 		optional int32 type = 1;
+		optional int32 beforeLevel = 2;
+		optional int32 afterLevel = 3;
+	}
+	message GuildSkillLevelUpResponse{
+		optional int32 type = 1;
+		optional int32 curlevel = 2;
 	}
 	
 	//公会技能重置
@ -431,6 +437,7 @@ import "CommonProto.proto";
 		optional int32 pathId = 1;
 		optional string guildName = 2;
 		optional int32 gid = 3;
+		optional string serverName = 4;
 	}
 	
 	message GetDeathPathStatusResponse{
--- a/protos/FightInfoProto.proto
+++ b/protos/FightInfoProto.proto
@ -1,4 +1,4 @@
-package com.ljsd.jieling.protocols;
+package rpc.protocols;

 option optimize_for = SPEED;

--- a/protos/HeroInfoProto.proto
+++ b/protos/HeroInfoProto.proto
@ -1,4 +1,4 @@
-package com.ljsd.jieling.protocols;
+package rpc.protocols;

 option optimize_for = SPEED;

--- a/protos/MapInfoProto.proto
+++ b/protos/MapInfoProto.proto
@ -1,4 +1,4 @@
-package com.ljsd.jieling.protocols;
+package rpc.protocols;

 option optimize_for = SPEED;

@ -80,6 +80,15 @@ import "CommonProto.proto";
 		optional int32 curTower = 20;//当前层数
 		
 		optional int32 bombUsed = 21;//炸弹已使用次数
+		
+		optional int32 killCount = 22;//已杀小怪数量
+		
+		repeated int32 trialRewardInfo = 23;//试炼领奖信息
+		
+		// 当前地图，试炼精气（如果召唤过boss 该值为 -1）
+		optional int32 essenceValue = 24;
+
+

 	}

@ -158,47 +167,12 @@ import "CommonProto.proto";
 	message UseTowerBuffResponse {
 		optional EventBehaviorCommon EventBehaviorCommon =1;
 	}
-	
-	
-	// 爬塔副本信息（试炼副本）
-	message TowerCopyInfo{
-		// 当前所在层数
-		optional int32 tower = 1;
-		// 已战斗次数
-		optional int32 fightCount = 2;
-		// 历史最高层
-		optional int32 highestTower = 3;
-		// 当前地图，试炼精气（如果召唤过boss 该值为 -1）
-		optional int32 essenceValue = 4;
-		// 是否显示重置：1、显示；0、不显示
-		optional int32 mapIntoReset = 5;
-		// 上层使用时间
-		optional int32 towerUseTime = 6;
-
-		repeated int32 trialRewardInfo = 7;//试炼领奖信息
-		
-		optional int32 killCount = 8;//已杀小怪数量
-		
-		optional int32 bombUsed = 9;//炸弹已使用次数
-
-	}
-	
-	


 	//关卡信息
 	message getAllLevelDifficultyInfosResponse{  
-		repeated LevelDifficultyInfos levelDifficultyInfos = 1;
-		// 副本信息
-		repeated MapInfo mapInfos = 2;
-		// 副本星级奖励领取进度
-		optional int32 starNum = 3;
-		// 爬塔副本信息
-		optional TowerCopyInfo towerCopyInfo = 4;
-		//已经玩过普通副本地图id
-		repeated int32 playedGenMapId = 5;
-		//精英关卡选择情况
-		repeated DifficultMapOption difficultMapOptions = 6;
+		optional int32 killCount = 1;//击杀小怪数量
+		repeated int32 trialRewardInfo = 2;//试炼领奖信息
 	}

 	// 查看排行榜
@ -269,6 +243,8 @@ import "CommonProto.proto";
 		optional Drop drop = 2;
 		
 		optional Cell cell = 3;//boss信息，位置id，事件id
+		
+		optional int32 monsterNum = 4;
 	}
 	//精英副本
 	message DifficultMapRequest{
@ -336,6 +312,9 @@ import "CommonProto.proto";
 	message TrialHeroInfoSaveRequest{
 		repeated string heroIds = 1;//保存上阵英雄
 	}
+	message TrialHeroInfoSaveResponse{
+		repeated TrialHeroInfo heroes = 1;
+	}
 	message GetTrialBoxRewardRequest{
 		optional int32 type = 1;//0为单个领取，1为全部领取
 	}
--- a/protos/MessageTypeProto.proto
+++ b/protos/MessageTypeProto.proto
@ -1,5 +1,5 @@

-package com.ljsd.jieling.protocols;
+package rpc.protocols;

 option optimize_for = SPEED;

@ -678,6 +678,10 @@ enum MessageType{
 	//迷宫寻宝探险
 	MISSING_ROOM_HERO_SEND_REQUEST = 11249;
 	MISSING_ROOM_HERO_SEND_RESPONSE = 11250;
+		
+	// 迷宫探险上锁
+	MISSING_ROOM_LOCK_REQUEST = 11256;
+	MISSING_ROOM_LOCK_RESPONSE = 11257;
 	
 	//地图小游戏相关
 	MAP_GAME_GET_REQUEST = 11251;
@ -978,8 +982,6 @@ enum MessageType{

     WORKSHOP_TECHNOLOGY_RESET_REQUEST = 12212; //科技树重置
    WORKSHOP_TECHNOLOGY_RESET_RESPONSE = 12213;
-	
-	



@ -1120,6 +1122,66 @@ enum MessageType{
 	SeletSubRewardPoolRequest = 303671;//易经宝库
 	SeletSubRewardPoolResponse = 303672;
 	
+	WorldLevelIndication= 303673;//世界等级推送
+	
+	
+	//303691 - 303692 新将来袭
+	NewGeneralAttackRequest = 303691;
+	NewGeneralAttackResponse = 303692;
+	
+	// 303701 - 303702 建木神树
+	UpgradeGodTreeRequest = 303701;
+	UpgradeGodTreeResponse = 303702;
+
+	ZeroPlayerUpdateIndication = 303703;
+	
+	//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;
+	
+	GetArenaRankRewardRequest = 900019;
+	GetArenaRankRewardResponse = 900020;
+	
+	ArenaClearInfoRequest = 900021;
+	
 }


--- a/protos/PlayerInfoProto.proto
+++ b/protos/PlayerInfoProto.proto
@ -1,4 +1,4 @@
-package com.ljsd.jieling.protocols;
+package rpc.protocols;

 option optimize_for = SPEED;

@ -72,6 +72,7 @@ import "CommonProto.proto";
 		optional int32 expeditionLeve =31 ; //猎妖之路阶段 -1 待选择
 		optional int32 hadLuckTime = 32;//幸运探宝次数
 		optional int32 hadAdvanceLuckTime = 33;//高级幸运探宝次数
+		optional int32 worldLeve = 34;//世界等级
 	}


@ -389,6 +390,10 @@ import "CommonProto.proto";
 		optional int32 hadLuckTime = 14;//幸运探宝次数
 		optional int32 hadAdvanceLuckTime = 15;//高级幸运探宝次数
 	}
+	
+	message ZeroPlayerUpdateIndication{
+		
+	}
 		

 	message GetMissionResponse{
@ -497,6 +502,7 @@ import "CommonProto.proto";
 	message GetPlayerOneTeamInfoRequest{
 		optional int32 playerId = 1;
 		optional int32 teamId = 2;
+		optional int32 serverId = 3;
 	}
 	message GetPlayerOneTeamInfoResponse{
 		optional TeamOneInfo teamInfo = 1;
@ -641,6 +647,7 @@ import "CommonProto.proto";
 	message ViewHeroInfoRequest{
 		optional int32 targetUid = 1;
 		optional string heroId = 2 ;// 动态id
+		optional int32 serverId = 3;
 	}

 	message ViewHeroInfoResponse{
@ -707,6 +714,11 @@ import "CommonProto.proto";
 	message MissingRoomAccelerateRequest{
 		optional int32 missionId = 1;
 	}
+	//迷宫寻宝任务加锁
+	message MissingRoomLockRequest{
+		optional int32 missionId = 1;
+		optional int32 lock = 2;//1：上锁，2：解锁
+	}
 	
 	message SexChangeRequest{
 	   optional int32 sex = 1; //0 男性 1 女
@ -762,6 +774,14 @@ import "CommonProto.proto";
 		optional int32 weekTime = 2;
 	}
 	
+	
+	message WorldLevelIndication{
+		optional int32 worldLeve = 1;//世界等级推送
+	}
+	
+	
+	
+	

 	
 	
--- a/protos/RoomFightProto.proto
+++ b/protos/RoomFightProto.proto
@ -1,4 +1,4 @@
-package com.ljsd.jieling.protocols;
+package rpc.protocols;

 option optimize_for = SPEED;

--- a/protos/RoomProto.proto
+++ b/protos/RoomProto.proto
@ -1,4 +1,4 @@
-package com.ljsd.jieling.protocols;
+package rpc.protocols;

 option optimize_for = SPEED;

--- a/protos/SceneFight.proto
+++ b/protos/SceneFight.proto
@ -1,4 +1,4 @@
-package com.ljsd.jieling.protocols;
+package rpc.protocols;

 option optimize_for = SPEED;

--- a/protos/gtGprotos/GlobalProto.proto
+++ b/protos/gtGprotos/GlobalProto.proto
@ -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；
+	}
+
+	
+	
+
+	
+	
--- a/protos/gtwprotos/WorldProto.proto
+++ b/protos/gtwprotos/WorldProto.proto
@ -0,0 +1,189 @@
+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;
+	}
+	message GetArenaRankRewardRequest{
+		optional int32 groupId = 1;
+	}
+
+	message ArenaRank{
+		optional int32 uid = 1;
+		optional int32 rank = 2;
+	}
+	message GetArenaRankRewardResponse{
+		repeated ArenaRank rankInfo =1;
+	}
+	
+	message ArenaClearInfoRequest{
+		optional int32 group = 1;
+	}
+	message ArenaClearInfoResponse{
+	
+	}
+	
+