Merge branch 'dh_dev_draw' into master_test_gn

protos/ActivityProto.proto

@@ -84,4 +84,26 @@ import "CommonProto.proto";
 		optional Drop drop = 2;
 		// 伤害值
 		optional int32 damageVal = 3;
-	}
+	}
+	
+	
+	// 选择抽卡
+	message choiceHeroRewardRequest{
+		optional int32 activityId = 1;
+		optional int32 rewardId = 2;
+	}
+	
+	message choiceHeroRewardResponse{
+	}
+	
+	message choiceDrawCardRequest{
+		optional int32 activityId = 1;
+		optional int32 type = 2; // 单抽:1 十连抽:2
+	}
+	
+	message choiceDrawCardResponse{
+		optional Drop drop = 1;
+	}
+	
+	
+	

protos/CommonProto.proto

@@ -289,10 +289,11 @@ option optimize_for = SPEED;
 		}
         required int32 activityId = 1;   	// 活动id
         repeated MissionInfo mission = 2;  	// 任务信息
-		optional int32 value = 6;            //活动记录值
-        optional int32 startTime = 5;   		// 任务开始时间
-        optional int32 endTime = 3;   		// 活动结束时间
+		optional int32 endTime = 3;   		// 活动结束时间
         optional int32 reallyOpen = 4; // 0:假开启 1：真开启
+        optional int32 startTime = 5;   		// 任务开始时间
+		optional int32 value = 6;            //活动记录值
+		optional int32 choiceRewardId = 7; //心愿抽奖,选择得奖励id
     }
 
     message GmResponse{

protos/MessageTypeProto.proto

@@ -1222,6 +1222,13 @@ enum MessageType{
 	
 	PurpleMansionSealIndication = 304105;
 	
+	// 选将抽卡
+	choiceHeroRewardRequest = 3040106;
+	choiceHeroRewardResponse = 3040107;
+	
+	choiceDrawCardRequest = 3040108;
+	choiceDrawCardResponse = 3040109;
+	
 	//800000起为global 协议
 	GetWorldServerRequest = 800001;//获取世界服ip
 	GetWorldServerResponse = 800002;
@@ -1241,7 +1248,6 @@ enum MessageType{
 	//跨服天梯挑战与被挑战 战斗记录
 	GetWorldArenaRecordInfoRequest= 900007;
 	GetWorldArenaRecordInfoResponse= 900008;
-	
 
 	
 	//gs --》word