公会战协议

protos/CommonProto.proto

@@ -530,6 +530,10 @@ option optimize_for = SPEED;
 		optional int32 days = 1; //签到的天数
 		optional int32 state = 2;//今日是否领取 
 	}
+	message TeamOneTeamInfo{
+		optional Team team = 1;
+		repeated int32 PokemonInfos = 2;
+	}
 	//第一编队信息
 	message TeamOneInfo{
 		optional int32 uid = 1;
@@ -537,7 +541,6 @@ option optimize_for = SPEED;
 		optional string name =3;
 		optional int32 head =4;
 		optional int32 headFrame = 5;
-		optional Team team = 6;
-		optional int32 totalForce=7;
-		repeated int32 PokemonInfos = 8;
+		optional int32 totalForce=6;
+		optional TeamOneTeamInfo team = 7;
 	}

protos/Family.proto

@@ -47,6 +47,11 @@ import "CommonProto.proto";
     	optional FamilyBaseInfo  familyBaseInfo =1;
     	optional int32 isApply = 2 ;//是否申请过 0：未申请 1：已申请
     }
+	
+	message FamilyDefendInfo{
+		optional int32 uid = 1;
+		optional int32 starCount = 2;
+	}
 
     message GetFamilyInfoResponse{
 		optional FamilyBaseInfo  familyBaseInfo =1; // 公会信息
@@ -176,7 +181,15 @@ import "CommonProto.proto";
 		optional int32 buildId = 1; //1、公会主城2、公会商店3、公会图腾
 	}
 	message FamilyDefendViewResponse{
-		repeated TeamOneInfo teamInfo = 1;
+		repeated FamilyDefendInfo info = 1;
+		
+	}
+	//查看布防具体信息
+	message FamilyDefendDetailViewRequest{
+		optional int32 playerId = 1;
+	}
+	message FamilyDefendDetailViewResponse{
+		optional TeamOneTeamInfo teamInfo = 1;
 	}
 	//一键布防
 	message FamilyQuickDefend{

protos/MessageTypeProto.proto

@@ -237,6 +237,14 @@ enum MessageType{
 	
 	FAMILY_VIEW_DEFEND_REQUEST = 10559;//查看公会布防信息
 	FAMILY_VIEW_DEFEND_RESPONSE = 10560;
+	
+	FAMILY_VIEW_DEFEND_DETAIL_REQUEST  = 10561;//查看具体编队信息
+	FAMILY_VIEW_DEFEND_DETAIL_RESPONSE = 10562;
+	
+	FAMILY_WALK_REQUEST = 10563;//公会人员行走
+	FAMILY_WALK_RESPONSE = 10564;
+	
+	FAMILY_WALK_INDICATION = 10565;
 
 // G 10600
     GET_PLAYERINFO_REQUEST   = 10600; //