公会协议

protos/CommonProto.proto

@@ -536,6 +536,8 @@ option optimize_for = SPEED;
 	message TeamOneTeamInfo{
 		optional Team team = 1;
 		repeated int32 PokemonInfos = 2;
+		optional int32 totalForce=3;
+
 	}
 	//第一编队信息
 	message TeamOneInfo{
@@ -544,6 +546,5 @@ option optimize_for = SPEED;
 		optional string name =3;
 		optional int32 head =4;
 		optional int32 headFrame = 5;
-		optional int32 totalForce=6;
-		optional TeamOneTeamInfo team = 7;
+		optional TeamOneTeamInfo team = 6;
 	}

protos/Family.proto

@@ -59,6 +59,7 @@ import "CommonProto.proto";
 		optional int32 uid = 1;
 		optional int32 starCount = 2;
 		optional int32 buildId = 3; //1、公会主城2、公会商店3、公会图腾
+		optional int32 curForce=4;//战斗力
 
 	}