Merge branch 'master_test_hw' into master_test_skin

protos/ActivityProto.proto

@@ -21,3 +21,12 @@ import "CommonProto.proto";
 	message GetShejiAwardResponse{
 		optional Drop drop = 1; 
 	}
+	
+	//选择易经宝库终极奖励
+	message SeletSubRewardPoolRequest{
+		optional int32 selectId = 1; 
+		optional int32 activityId = 2; 
+	}
+	message SeletSubRewardPoolResponse{
+		
+	}

protos/CommonProto.proto

@@ -753,6 +753,7 @@ option optimize_for = SPEED;
 		optional int32 star = 2;
 		optional int32 level =3;
 		optional double remainHp =4;//剩余血量
+		optional int32 position = 5; //位置 1 2 3 4 一次从左到右
 	}
 	
 	message ExpeditionTeamInfo{

protos/MessageTypeProto.proto

@@ -1092,6 +1092,9 @@ enum MessageType{
 	GetShejiAwardRequest = 303655;//社稷大典抢夺
 	GetShejiAwardResponse = 303656;
 	
+	//303671 - 30380 社稷大典
+	SeletSubRewardPoolRequest = 303671;//易经宝库
+	SeletSubRewardPoolResponse = 303672;
 	
 }