Merge branch 'dh_dev_draw' into master_test_gn

protos/CommonProto.proto

@@ -991,3 +991,16 @@ option optimize_for = SPEED;
 	    optional int32 key = 1;
 		optional int32 val = 2;
 	}
+
+	// 心愿抽卡
+	message wishDrawCardInfo{
+		optional int32 id = 1;//序列id
+		optional int32 heroTid = 2;//英雄模板id
+		optional int32 status = 3;//状态 0:未锁 1:锁定
+	}
+	
+	// 抽卡类型次数
+	message randomTypeNum{
+		optional int32 type = 1;//招募类型
+		optional int32 num = 2;//数量
+	}

protos/HeroInfoProto.proto

@@ -41,7 +41,7 @@ import "CommonProto.proto";
 		optional Drop drop =1 ;
 		optional Drop extraBox = 2 ;//宝箱奖励
 		optional int32 mustCount = 3;//剩余必出次数
-
+		repeated randomTypeNum drawTimes = 4;//类型抽卡次数
 	}
 
 	message TeamposSaveRequest{
@@ -383,4 +383,18 @@ import "CommonProto.proto";
 		repeated PurpleMansionSeal sealList = 1;
 	}
 	
+	
+	// 心愿抽卡
+	message wishDrawCardIndication{
+		repeated wishDrawCardInfo infoList = 1;
+	}
+	
+	message choiceWishHeroRequest{
+		repeated wishDrawCardInfo infoList = 1;//不用status
+	}
+	
+	message choiceWishHeroResponse{
+		repeated wishDrawCardInfo infoList = 1;
+
+	}
 	

protos/MessageTypeProto.proto

@@ -1229,6 +1229,16 @@ enum MessageType{
 	choiceDrawCardRequest = 3040108;
 	choiceDrawCardResponse = 3040109;
 	
+	// 心愿抽卡
+	wishDrawCardIndication = 3040123;
+
+	choiceWishHeroRequest = 3040124;
+
+	choiceWishHeroResponse = 3040125;
+	
+	
+	
+	
 	//800000起为global 协议
 	GetWorldServerRequest = 800001;//获取世界服ip
 	GetWorldServerResponse = 800002;

protos/PlayerInfoProto.proto

@@ -49,7 +49,7 @@ import "CommonProto.proto";
 		repeated int32 vipLeveTake = 7;
 		optional int32 userCreateTime = 8; // 玩家创角时间
 		repeated int32 redType = 9;// 红点信息
-		optional int32 randCount = 10;//已招募次数
+		optional int32 randCount = 10;//已招募次数(废弃)
 		repeated EveryHeroHandBook heroHandBook = 11;//英雄图鉴
 		repeated int32 equipHandBook = 12;//装备图鉴
 		repeated int32 towerReceivedReward = 13;//试炼已领取奖励层数
@@ -82,6 +82,7 @@ import "CommonProto.proto";
 		optional int32 practiceLevel = 41;//修行等级
 		repeated PurpleMansionSeal sealList = 42;//神印列表
 		optional int32 randomCount = 43;//抽卡剩余必出
+		repeated randomTypeNum drawTimes = 44;//类型抽卡总次数
 	}